diff --git a/env.cpp b/env.cpp
index b90e3d6dc..936729b93 100644
--- a/env.cpp
+++ b/env.cpp
@@ -693,7 +693,7 @@ void env_destroy()
 		{
 			has_changed = 1;
 		}
-	
+
 		delete entry;
 	}
 
@@ -1454,7 +1454,6 @@ void env_pop()
 			{
 				has_changed = 1;
 			}
-	
 			delete entry;
 		}
 
diff --git a/env_universal_common.cpp b/env_universal_common.cpp
index 9628b6309..deb4fc5b6 100644
--- a/env_universal_common.cpp
+++ b/env_universal_common.cpp
@@ -522,6 +522,7 @@ void env_universal_common_remove( const wcstring &name )
 	if (result != env_universal_var.end())
 	{
 		var_uni_entry_t* v = result->second;		
+		env_universal_var.erase(result);
 		delete v;
 	}
 }