Better error msg for Hive on Spark in case user cancels query and closes session

In case user cancels a query and closes the session, Hive marks the query as failed. However, the error message is a little confusing. It still says:

org.apache.hive.service.cli.HiveSQLException: Error while processing statement: FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.spark.SparkTask. Failed to create spark client. This is likely because the queue you assigned to does not have free resource at the moment to start the job. Please check your queue usage and try the query again later.

followed by some InterruptedException.
Ideally, the error should clearly indicates the fact that user cancels the execution.