CLOUD-1000 fix NPE
Merge pull request #262 from sequenceiq/fixit-fast

fix NPE