Bump version
Avoid possible null pointer exception

ClassLoader can be null