Feature/exception improvements