CLOUD-383 updated exception handling
Merge pull request #26 from sequenceiq/exception-handling

CLOUD-383 updated exception handling