NPE fix
Merge pull request #194 from apaiva/npe_fix

NPE fix