diff --git a/src/d_main.cpp b/src/d_main.cpp
index f72dc368b..ca2c3b38f 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -2270,8 +2270,6 @@ void D_DoomMain (void)
 		execFiles = Args->GatherFiles ("-exec");
 		D_MultiExec (execFiles, true);
 
-		C_ExecCmdLineParams ();		// [RH] do all +set commands on the command line
-
 		CopyFiles(allwads, pwads);
 
 		// Since this function will never leave we must delete this array here manually.
@@ -2287,6 +2285,8 @@ void D_DoomMain (void)
 		// Now that wads are loaded, define mod-specific cvars.
 		ParseCVarInfo();
 
+		C_ExecCmdLineParams ();		// [RH] do all +set commands on the command line
+
 		// [RH] Initialize localizable strings.
 		GStrings.LoadStrings (false);
 
diff --git a/src/dthinker.cpp b/src/dthinker.cpp
index 327b29731..9ab8d5e31 100644
--- a/src/dthinker.cpp
+++ b/src/dthinker.cpp
@@ -357,12 +357,10 @@ void DThinker::DestroyThinkersInList (FThinkerList &list)
 {
 	if (list.Sentinel != NULL)
 	{
-		DThinker *node = list.Sentinel->NextThinker;
-		while (node != list.Sentinel)
+		for (DThinker *node = list.Sentinel->NextThinker; node != list.Sentinel; node = list.Sentinel->NextThinker)
 		{
-			DThinker *next = node->NextThinker;
+			assert(node != NULL);
 			node->Destroy();
-			node = next;
 		}
 		list.Sentinel->Destroy();
 		list.Sentinel = NULL;
@@ -380,9 +378,8 @@ void DThinker::DestroyMostThinkersInList (FThinkerList &list, int stat)
 	  // it from the list. G_FinishTravel() will find it later from
 	  // a players[].mo link and destroy it then, after copying various
 	  // information to a new player.
-		for (DThinker *probe = list.Sentinel->NextThinker, *next; probe != list.Sentinel; probe = next)
+		for (DThinker *probe = list.Sentinel->NextThinker; probe != list.Sentinel; probe = list.Sentinel->NextThinker)
 		{
-			next = probe->NextThinker;
 			if (!probe->IsKindOf(RUNTIME_CLASS(APlayerPawn)) ||		// <- should not happen
 				static_cast<AActor *>(probe)->player == NULL ||
 				static_cast<AActor *>(probe)->player->mo != probe)
diff --git a/src/g_shared/a_pickups.cpp b/src/g_shared/a_pickups.cpp
index 3ebcedb40..cc559ea94 100644
--- a/src/g_shared/a_pickups.cpp
+++ b/src/g_shared/a_pickups.cpp
@@ -1792,7 +1792,10 @@ bool ABackpackItem::HandlePickup (AInventory *item)
 AInventory *ABackpackItem::CreateTossable ()
 {
 	ABackpackItem *pack = static_cast<ABackpackItem *>(Super::CreateTossable());
-	pack->bDepleted = true;
+	if (pack != NULL)
+	{
+		pack->bDepleted = true;
+	}
 	return pack;
 }