More Exceptions added