From 286ff21dd122196f906d0a9aa7c10f4e5e780ea8 Mon Sep 17 00:00:00 2001
From: Ignacio Etcheverry <ignalfonsore@gmail.com>
Date: Wed, 25 Jul 2018 21:30:43 +0200
Subject: [PATCH] Fix '!valid' error spam on C# script instance create

(cherry picked from commit 8edf85b09c014bee48adcc515a46cf315ef393f5)
---
 modules/mono/csharp_script.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp
index 1838282c1a2..d9ad9e2e433 100644
--- a/modules/mono/csharp_script.cpp
+++ b/modules/mono/csharp_script.cpp
@@ -1953,8 +1953,6 @@ Variant CSharpScript::_new(const Variant **p_args, int p_argcount, Variant::Call
 
 ScriptInstance *CSharpScript::instance_create(Object *p_this) {
 
-	ERR_FAIL_COND_V(!valid, NULL);
-
 	if (!tool && !ScriptServer::is_scripting_enabled()) {
 #ifdef TOOLS_ENABLED
 		PlaceHolderScriptInstance *si = memnew(PlaceHolderScriptInstance(CSharpLanguage::get_singleton(), Ref<Script>(this), p_this));
@@ -1971,13 +1969,15 @@ ScriptInstance *CSharpScript::instance_create(Object *p_this) {
 			// The project assembly is not loaded
 			ERR_EXPLAIN("Cannot instance script because the project assembly is not loaded. Script: " + get_path());
 			ERR_FAIL_V(NULL);
-		}
-		
+		} else {
 			// The project assembly is loaded, but the class could not found
-		ERR_EXPLAIN("Cannot instance script because the class '" + name + "' could not be found. Script: " + get_path());
-		ERR_FAIL_V(NULL);
+			ERR_EXPLAIN("Cannot instance script because the class '" + name + "' could not be found. Script: " + get_path());
+			ERR_FAIL_V(NULL);
+		}
 	}
 
+	ERR_FAIL_COND_V(!valid, NULL);
+
 	if (native) {
 		String native_name = native->get_name();
 		if (!ClassDB::is_parent_class(p_this->get_class_name(), native_name)) {