changed exception messages and added warning supression