WL-2585 Poor error message
Merge pull request #20 from ox-it/WL-2585

WL-2585 Poor error message