DDF-111: Add javadoc and remove exception, per code review