Fix #50 - Confusing error message
Merge branch 'bugfix/50'