Added more Exceptions