Fix NPE on AppEngine test
Merge pull request #884 from dlsniper/fix-877

Fix NPE on AppEngine test