cleaned up the exceptions