Harden for exceptions found in production
Cleanup
Version Bump