removed deprecated e.message, changed type(self) -> self.__class__, fixed error messages