use app contextID
check for null
Merge pull request #7 from arraydev/minor_fixes

Minor fixes (I pull it but without the null check in TargetProductSelector)