1 files changed, 58 insertions, 1 deletions

diff --git a/Emby.Server.Implementations/Data/SqliteExtensions.cs b/Emby.Server.Implementations/Data/SqliteExtensions.cs
index 657dadfe5..e4e91626d 100644
--- a/Emby.Server.Implementations/Data/SqliteExtensions.cs
+++ b/Emby.Server.Implementations/Data/SqliteExtensions.cs
@@ -173,6 +173,16 @@ namespace Emby.Server.Implementations.Data
             return result[index].ReadGuid();
         }
 
+        private static void CheckName(string name)
+        {
+#if DEBUG
+            //if (!name.IndexOf("@", StringComparison.OrdinalIgnoreCase) != 0)
+            {
+                throw new Exception("Invalid param name: " + name);
+            }
+#endif
+        }
+
         public static void TryBind(this IStatement statement, string name, double value)
         {
             IBindParameter bindParam;
@@ -180,6 +190,10 @@ namespace Emby.Server.Implementations.Data
             {
                 bindParam.Bind(value);
             }
+            else
+            {
+                CheckName(name);
+            }
         }
 
         public static void TryBind(this IStatement statement, string name, string value)
@@ -187,7 +201,18 @@ namespace Emby.Server.Implementations.Data
             IBindParameter bindParam;
             if (statement.BindParameters.TryGetValue(name, out bindParam))
             {
-                bindParam.Bind(value);
+                if (value == null)
+                {
+                    bindParam.BindNull();
+                }
+                else
+                {
+                    bindParam.Bind(value);
+                }
+            }
+            else
+            {
+                CheckName(name);
             }
         }
 
@@ -198,6 +223,10 @@ namespace Emby.Server.Implementations.Data
             {
                 bindParam.Bind(value);
             }
+            else
+            {
+                CheckName(name);
+            }
         }
 
         public static void TryBind(this IStatement statement, string name, float value)
@@ -207,6 +236,10 @@ namespace Emby.Server.Implementations.Data
             {
                 bindParam.Bind(value);
             }
+            else
+            {
+                CheckName(name);
+            }
         }
 
         public static void TryBind(this IStatement statement, string name, int value)
@@ -216,6 +249,10 @@ namespace Emby.Server.Implementations.Data
             {
                 bindParam.Bind(value);
             }
+            else
+            {
+                CheckName(name);
+            }
         }
 
         public static void TryBind(this IStatement statement, string name, Guid value)
@@ -225,6 +262,10 @@ namespace Emby.Server.Implementations.Data
             {
                 bindParam.Bind(value.ToGuidParamValue());
             }
+            else
+            {
+                CheckName(name);
+            }
         }
 
         public static void TryBind(this IStatement statement, string name, DateTime value)
@@ -234,6 +275,10 @@ namespace Emby.Server.Implementations.Data
             {
                 bindParam.Bind(value.ToDateTimeParamValue());
             }
+            else
+            {
+                CheckName(name);
+            }
         }
 
         public static void TryBind(this IStatement statement, string name, long value)
@@ -243,6 +288,10 @@ namespace Emby.Server.Implementations.Data
             {
                 bindParam.Bind(value);
             }
+            else
+            {
+                CheckName(name);
+            }
         }
 
         public static void TryBind(this IStatement statement, string name, byte[] value)
@@ -252,6 +301,10 @@ namespace Emby.Server.Implementations.Data
             {
                 bindParam.Bind(value);
             }
+            else
+            {
+                CheckName(name);
+            }
         }
 
         public static void TryBindNull(this IStatement statement, string name)
@@ -261,6 +314,10 @@ namespace Emby.Server.Implementations.Data
             {
                 bindParam.BindNull();
             }
+            else
+            {
+                CheckName(name);
+            }
         }
 
         public static void TryBind(this IStatement statement, string name, DateTime? value)