DEVIDM-65: Propagating errors.
Merge pull request #30 from tomma/DEVIDM-65

DEVIDM-65: Propagating errors.