[mondrian-1601] avoid NPE on query cancellation

842dd020524faa59af40ff564a9a0b8d138ae881 from master
Merge pull request #130 from tgf/mondrian-1601_lagunitas

[mondrian-1601] avoid NPE on query cancellation