diff --git a/libraries/cms/schema/changeitem.php b/libraries/cms/schema/changeitem.php
index dafd1bf6d4993..a7dee9ee18582 100644
--- a/libraries/cms/schema/changeitem.php
+++ b/libraries/cms/schema/changeitem.php
@@ -195,7 +195,18 @@ public function check()
 		if ($this->checkQuery)
 		{
 			$this->db->setQuery($this->checkQuery);
-			$rows = $this->db->loadObject();
+
+			try
+			{
+				$rows = $this->db->loadObject();
+			}
+			catch (RuntimeException $e)
+			{
+				$rows = false;
+
+				// Still render the error message from the Exception object
+				JFactory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+			}
 
 			if ($rows !== false)
 			{