fix for bugzilla 7693

another test

better to throw on invalid input

whitespace

merged comments

tracking the windows bug from linux