diff --git a/src/Storage/MySQL.cs b/src/Storage/MySQL.cs
index 7f7e6f5..49d4e03 100644
--- a/src/Storage/MySQL.cs
+++ b/src/Storage/MySQL.cs
@@ -58,7 +58,8 @@ namespace OpenSim.Modules.DataValue.Storage
 
                 using (IDataReader _mysqlReader = _mysqlCommand.ExecuteReader())
                 {
-                    _mysqlReader.Read();
+                    if (!_mysqlReader.Read())
+                        return false;
 
                     if (_mysqlReader["StorageKey"] != null)
                         return true;
@@ -78,7 +79,8 @@ namespace OpenSim.Modules.DataValue.Storage
 
                 using (IDataReader _mysqlReader = _mysqlCommand.ExecuteReader())
                 {
-                    _mysqlReader.Read();
+                    if (!_mysqlReader.Read())
+                        return null;
 
                     if (_mysqlReader["StorageData"] != null)
                         return _mysqlReader["StorageData"].ToString();