diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 05381742c..29031dcb3 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@ D1X-Rebirth Changelog
 20100304
 --------
 main/piggy.c, main/text.c, main/text.h: Fixed some Piggy- and Text-loading routines for Shareware, Destination Saturn and 1.0 Registered; Full support for End-Briefing on non-registered still missing however
+main/mission.c: Init variables/strings at the beginning of load_mission() to prevent errors if demo content is used
 
 20100303
 --------
diff --git a/main/mission.c b/main/mission.c
index 437f04b17..79b406ef9 100644
--- a/main/mission.c
+++ b/main/mission.c
@@ -473,6 +473,12 @@ int load_mission(mle *mission)
 	Current_mission->filename = Current_mission->path + (mission->filename - mission->path);
 	Current_mission->n_secret_levels = 0;
 
+	//init vars
+	Last_level = 0;
+	Last_secret_level = 0;
+	Briefing_text_filename[0] = 0;
+	Ending_text_filename[0] = 0;
+
 	// for Descent 1 missions, load descent.hog
 	if (!cfile_init("descent.hog", 1))
 		Error("descent.hog not available!\n");
@@ -508,12 +514,6 @@ int load_mission(mle *mission)
 	if (cfexist(buf))
 		cfile_init(buf, 0);
 
-	//init vars
-	Last_level = 0;
-	Last_secret_level = 0;
-	Briefing_text_filename[0] = 0;
-	Ending_text_filename[0] = 0;
-
 	while (cfgets(buf,80,mfile)) {
 		if (istok(buf,"type"))
 			continue;						//already have name, go to next line