diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index 3fe1b985c..13ffc9970 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,6 +1,8 @@
 Changes towards version 0.7:
-- Support for 3do "ship spin" videos (TODO: Update with bug # and proper 
-  credits)
+- Fixed a crash on startup if uqm.cfg did not exist, flagged and fixed 
+  by jdorje - MIchael
+- Support for 3do "ship spin" videos (Bug #733, patch by Jan Lönnberg) 
+  -Michael
 - Major refactoring of input configuration to use the resource system 
   instead of custom files (bugs #961 and #949) - Michael
 - Added ability to remove entries from ALists - Michael
diff --git a/sc2/src/sc2code/libs/resource/alist.c b/sc2/src/sc2code/libs/resource/alist.c
index cbdf42b16..78df762b5 100644
--- a/sc2/src/sc2code/libs/resource/alist.c
+++ b/sc2/src/sc2code/libs/resource/alist.c
@@ -115,6 +115,10 @@ const char *
 Alist_RemoveString (alist *m, const char *key)
 {
 	alist_entry *todel = NULL;
+	if (!m->first)
+	{
+		return NULL;
+	}
 	if (!strcmp (m->first->key, key))
 	{
 		todel = m->first;