Adding missing Exceptions