[RANDOM-ID] - proper error throwing
Merge pull request #8 from michalbe/master-temp

[RANDOM-ID] - proper error throwing