fix return type after aborts

followup for last pull request: return type has be set after eventual abort.