Fixing all the exceptions!