diff --git a/blackboard/bb_param/bb_param.cpp b/blackboard/bb_param/bb_param.cpp
index b571638..9cf8168 100644
--- a/blackboard/bb_param/bb_param.cpp
+++ b/blackboard/bb_param/bb_param.cpp
@@ -72,7 +72,7 @@ Variant BBParam::get_value(Object *p_agent, const Ref<Blackboard> &p_blackboard,
 	if (value_source == SAVED_VALUE) {
 		return saved_value;
 	} else {
-		ERR_FAIL_COND_V_MSG(!p_blackboard->has_var(variable), p_default, vformat("BBParam: Blackboard variable doesn't exist: \"%s\".", p_default));
+		ERR_FAIL_COND_V_MSG(!p_blackboard->has_var(variable), p_default, vformat("BBParam: Blackboard variable \"%s\" doesn't exist.", variable));
 		return p_blackboard->get_var(variable, p_default);
 	}
 }
diff --git a/tests/test_check_var.h b/tests/test_check_var.h
index 392f096..a5783ef 100644
--- a/tests/test_check_var.h
+++ b/tests/test_check_var.h
@@ -17,6 +17,7 @@
 #include "modules/limboai/bt/tasks/blackboard/bt_check_var.h"
 #include "modules/limboai/bt/tasks/bt_task.h"
 #include "modules/limboai/util/limbo_utility.h"
+#include "tests/test_macros.h"
 
 namespace TestCheckVar {
 
@@ -38,9 +39,9 @@ TEST_CASE("[Modules][LimboAI] BTCheckVar") {
 	cv->initialize(dummy, bb);
 
 	SUBCASE("Check with empty variable and value") {
-		ERR_PRINT_OFF;
 		cv->set_variable("");
 		cv->set_value(nullptr);
+		ERR_PRINT_OFF;
 		CHECK(cv->execute(0.01666) == BTTask::FAILURE);
 		ERR_PRINT_ON;
 	}
@@ -52,12 +53,20 @@ TEST_CASE("[Modules][LimboAI] BTCheckVar") {
 		SUBCASE("When checking against another variable") {
 			cv->set_check_type(LimboUtility::CHECK_EQUAL);
 			value->set_value_source(BBParam::BLACKBOARD_VAR);
-			value->set_variable("compare_var");
 			bb->set_var("var", 123);
-			bb->set_var("compare_var", 123);
-			CHECK(cv->execute(0.01666) == BTTask::SUCCESS);
-			bb->set_var("compare_var", 567);
-			CHECK(cv->execute(0.01666) == BTTask::FAILURE);
+			SUBCASE("When variable exists") {
+				value->set_variable("compare_var");
+				bb->set_var("compare_var", 123);
+				CHECK(cv->execute(0.01666) == BTTask::SUCCESS);
+				bb->set_var("compare_var", 567);
+				CHECK(cv->execute(0.01666) == BTTask::FAILURE);
+			}
+			SUBCASE("When variable doesn't exist") {
+				value->set_variable("not_found");
+				ERR_PRINT_OFF;
+				CHECK(cv->execute(0.01666) == BTTask::FAILURE);
+				ERR_PRINT_ON;
+			}
 		}
 
 		value->set_value_source(BBParam::SAVED_VALUE);