Fixed camelCaps
Cleanup
Changed fatal exception to warning