Added and adjusted Exceptions