Changed to java 1.7, clean up CatcherImpl