removed obsolete method
Changes exception messages
added import