Had stopped working because the catalog now behaves a little different, returning nullptr instead of an invalid element.