Added a missing SAFERETURN