Cleaned up exception parsing
Bug fix