Feature/838 addr settings dmlerror

Fix for #838 and #839.

@kbromer - very short pull request. It was a quick fix.

@jlantz - this should be the last piece we need in place for 1.9. Ready for takeoff!