SCC-120: fix NPE
Merge pull request #102 from mulesoft/SCC-120

SCC-120: fix NPE