Merge pull request #9 from markvanveen/develop

Add null check to prevent NPE when saving product definition without …