I think we should start catching Exception here and similar places where we'd otherwise just fall off the end. 

Programming errors resulting in NPE or similar seems to be much more common than I/O exceptions.

Major rework like this constitutes a good time to improve error handling.