check for null iconId
Merge pull request #15 from karuna-vertigo/master

Check for null iconId