Regression introduced with 6884ef63 "java: don't
catch and then just rethrow an exception."

Change-Id: I626eaefc7846e152dfb4cc105d665c9ccca68c08