Fix error return logic since refactoring