Improve raise_error method. Message handling and avoid weird rescue usage