Fixing minor exception checks