1 files changed, 9 insertions, 3 deletions
diff --git a/src/map.cpp b/src/map.cpp
index c981567ae..10dba3de9 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -1010,6 +1010,12 @@ void Map::addNodeAndUpdate(v3s16 p, MapNode n,
 	}
 
 	/*
+		Remove node metadata
+	*/
+
+	removeNodeMetadata(p);
+
+	/*
 		Set the node on the map
 	*/
 
@@ -3451,15 +3457,15 @@ MapBlock* ServerMap::loadBlock(v3s16 blockpos)
 		}
 		catch(InvalidFilenameException &e)
 		{
-			return false;
+			return NULL;
 		}
 		catch(FileNotGoodException &e)
 		{
-			return false;
+			return NULL;
 		}
 		catch(std::exception &e)
 		{
-			return false;
+			return NULL;
 		}
 	}