Commiting prior to 'refactored error handling' feature branch