MasterCatalog: set query plan null if cannot deserialize it

Fix #600
Merge pull request #606 from uwescience/fix-600

MasterCatalog: set query plan null if cannot deserialize it