Changes error handling order