Adding some exceptions from Kyle