CLOUD-99 NPE check added - leads to another error to be handled later
CLOUD-99 NPE check added - leads to another error to be handled later
Merge pull request #43 from sequenceiq/npe

Npe