Cleaned up the new exceptions and made them a little cleaner.
Licence formatting.
Removed extra imports.