added return to error-handler