diff --git a/src/Scripting/CSharp/CSharpScript.cs b/src/Scripting/CSharp/CSharpScript.cs
index 1b97f0ce41b043a510301f626af7faee861d5494..581e98394f37504c01e27089a1225df13a04dbd5 100644
--- a/src/Scripting/CSharp/CSharpScript.cs
+++ b/src/Scripting/CSharp/CSharpScript.cs
@@ -24,8 +24,10 @@ public static class CSharpScript
         /// <param name="globalsType">Type of global object.</param>
         /// <param name="assemblyLoader">Custom  assembly loader.</param>
         /// <typeparam name="T">The return type of the script</typeparam>
+        /// <exception cref="ArgumentNullException">Code is null.</exception>
         public static Script<T> Create<T>(string code, ScriptOptions options = null, Type globalsType = null, InteractiveAssemblyLoader assemblyLoader = null)
         {
+            if (code == null) throw new ArgumentNullException(nameof(code));
             return Script.CreateInitialScript<T>(CSharpScriptCompiler.Instance, SourceText.From(code, options?.FileEncoding), options, globalsType, assemblyLoader);
         }
 
@@ -52,8 +54,10 @@ public static Script<T> Create<T>(Stream code, ScriptOptions options = null, Typ
         /// <param name="options">The script options.</param>
         /// <param name="globalsType">Type of global object.</param>
         /// <param name="assemblyLoader">Custom  assembly loader.</param>
+        /// <exception cref="ArgumentNullException">Code is null.</exception>
         public static Script<object> Create(string code, ScriptOptions options = null, Type globalsType = null, InteractiveAssemblyLoader assemblyLoader = null)
         {
+            if (code == null) throw new ArgumentNullException(nameof(code));
             return Create<object>(code, options, globalsType, assemblyLoader);
         }
 
diff --git a/src/Scripting/CSharpTest/ScriptTests.cs b/src/Scripting/CSharpTest/ScriptTests.cs
index 4c7fd19ab2d9e49fe10a515a66ee27bbc31f3e8f..479948b6d07e05c4de96b3ba2bfa0bfc1a0e1d4e 100644
--- a/src/Scripting/CSharpTest/ScriptTests.cs
+++ b/src/Scripting/CSharpTest/ScriptTests.cs
@@ -31,6 +31,12 @@ public void TestCreateScript()
             Assert.Equal("1 + 2", script.Code);
         }
 
+        [Fact]
+        public void TestCreateScript_CodeIsNull()
+        {
+            Assert.Throws<ArgumentNullException>(() => CSharpScript.Create((string)null));
+        }
+
         [Fact]
         public void TestCreateFromStreamScript()
         {
@@ -38,6 +44,12 @@ public void TestCreateFromStreamScript()
             Assert.Equal("1 + 2", script.Code);
         }
 
+        [Fact]
+        public void TestCreateFromStreamScript_StreamIsNull()
+        {
+            Assert.Throws<ArgumentNullException>(() => CSharpScript.Create((Stream)null));
+        }
+
         [Fact]
         public async Task TestGetCompilation()
         {