Took out an exception
Took out some exceptions