Updated static method calls to attempt to add java.lang to start of class if an error occurs
Took out the exit on close call for the swing-test