Exception Bug fix