Added some catches