Some minor changes made to the exception classes