Throw all errors correctly
Merge pull request #2 from ByHours-com/master

Throw all errors correctly