Tweak to fix a crash on exit, attempt to fix missing jawt error on 
Java 7