Query cancellation throws error, reports wrong query text

I was experimenting with a SELECT DISTINCT query for a unique column with a billion values, to see if it would exceed the mem limit. It eventually did start returning results. When I hit ^C to cancel in impala-shell, the result looked like this:

-----------
ERROR: Invalid query handle
Query: use oreilly

I think impala-shell should handle the cancellation gracefully rather than printing an "invalid query handle" error. What's really confusing is why it echoed

Query: use oreilly

which was the statement that immediately preceded my SELECT query. (The USE was run behind the scenes by 'impala-shell -d oreilly'.) It looks like impala-shell forgot which query it was cancelling.