Syncing Ian's JRE6 compatibility & WAITUNTIL interrupt handling

The WAITUNTIL change seemed to fix the stopping problem for one of the test programs-- I suspect that same line will need to be added to each class with a similar try/catch block.