#1111 - Rollback refactoring
Merge branch 'render_error_message'