diff --git a/Generals/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp b/Generals/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp
index 933c664aa69..3331df9e25f 100644
--- a/Generals/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp
@@ -323,7 +323,7 @@ WorldHeightMapEdit::WorldHeightMapEdit(ChunkInputStream *pStrm):
 Bool WorldHeightMapEdit::remapTextures()
 {
 	Int i;
-	Bool anyChanges;
+	Bool anyChanges = false;
 	for (i=0; i<m_numTextureClasses; i++) {
 		TerrainModal modalTerrainDlg(m_textureClasses[i].name, this);
 		if (IDOK==modalTerrainDlg.DoModal()) {
@@ -3394,6 +3394,7 @@ void WorldHeightMapEdit::findBoundaryNear(Coord3D *pt, float okDistance, Int *ou
 
 	if (!pt) {
 		(*outNdx) = -1;
+		return;
 	}
 
 	int numBoundaries = m_boundaries.size();
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp
index 3aeba787257..66378705e70 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp
@@ -324,7 +324,7 @@ WorldHeightMapEdit::WorldHeightMapEdit(ChunkInputStream *pStrm):
 Bool WorldHeightMapEdit::remapTextures()
 {
 	Int i;
-	Bool anyChanges;
+	Bool anyChanges = false;
 	for (i=0; i<m_numTextureClasses; i++) {
 		TerrainModal modalTerrainDlg(m_textureClasses[i].name, this);
 		if (IDOK==modalTerrainDlg.DoModal()) {
@@ -3366,6 +3366,7 @@ void WorldHeightMapEdit::findBoundaryNear(Coord3D *pt, float okDistance, Int *ou
 
 	if (!pt) {
 		(*outNdx) = -1;
+		return;
 	}
 
 	int numBoundaries = m_boundaries.size();