Fixes issue #3
Handled more returned error values
Fixes issue #3
Merge pull request #4 from weberc2/master

Fixes issue #3