diff --git a/lib/private/hintexception.php b/lib/private/hintexception.php
index f673ac82ac..7c4754a92e 100644
--- a/lib/private/hintexception.php
+++ b/lib/private/hintexception.php
@@ -38,6 +38,9 @@ class HintException extends \Exception {
 	}
 
 	public function getHint() {
+		if (empty($this->hint)) {
+			return $this->message;
+		}
 		return $this->hint;
 	}
 }