From 120d2e12b058659075ab11536d96a981682a09fa Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 25 May 2015 01:21:57 +0200
Subject: [PATCH] Improve QtValueError wording for ensure_not_null.

---
 qutebrowser/utils/qtutils.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/utils/qtutils.py b/qutebrowser/utils/qtutils.py
index 939e1ed81..f175dc202 100644
--- a/qutebrowser/utils/qtutils.py
+++ b/qutebrowser/utils/qtutils.py
@@ -131,7 +131,7 @@ def ensure_valid(obj):
 def ensure_not_null(obj):
     """Ensure a Qt object with an .isNull() method is not null."""
     if obj.isNull():
-        raise QtValueError(obj)
+        raise QtValueError(obj, null=True)
 
 
 def check_qdatastream(stream):
@@ -322,12 +322,15 @@ class QtValueError(ValueError):
 
     """Exception which gets raised by ensure_valid."""
 
-    def __init__(self, obj):
+    def __init__(self, obj, null=False):
         try:
             self.reason = obj.errorString()
         except AttributeError:
             self.reason = None
-        err = "{} is not valid".format(obj)
+        if null:
+            err = "{} is null".format(obj)
+        else:
+            err = "{} is not valid".format(obj)
         if self.reason:
             err += ": {}".format(self.reason)
         super().__init__(err)