Removed early return from exception handler