Cleaned up the exceptions