Add a check to avoid NPE
Ignoring Goal class when deserializing
Merge pull request #153 from CodePath-MAF/npe-fixes

Npe fixes