Refactoring. Fixed wit_response exception handling