Exception enhancement

Cleaned up the exceptions