Exception handling: cleanup, javadoc, builders.