Adjusted some exception classes and messages