Improved test
Failing test
Better error handling
Merge branch 'error-reporting' into empty-string
Handle empty strings correctly