avoid NPE on product filtering
Merge pull request #264 from daniellemayne/develop

avoid NPE on product filtering
incrimental changes
added Snapshot States of SKIPPED and ERROR to cover GCE needs.