Added some exceptions for weird situations