Added several exceptions