Fix bogus internal error msg. Resolves #379

(Note, a large portion of these changes are here because develop doesn't have the earlier PR's in it yet, and It was hard for me to test this issue alone without my other fixes in place, so I didn't do it from raw develop branch.  Once you merge the other PR into develop, most of these diffs should disappear.)