fixed null pointer errors in Swing bits
Scala actually did bad things this time