diff --git a/MeshLib/MeshGenerators/MeshLayerMapper.cpp b/MeshLib/MeshGenerators/MeshLayerMapper.cpp
index 416006b8972bf00df0b306aa6a4bce514fb2078f..349e4f55897eeb37c44ddb06459dca3536aec7ac 100644
--- a/MeshLib/MeshGenerators/MeshLayerMapper.cpp
+++ b/MeshLib/MeshGenerators/MeshLayerMapper.cpp
@@ -112,7 +112,7 @@ bool MeshLayerMapper::createRasterLayers(MeshLib::Mesh const& mesh, std::vector<
 	if (nLayers < 2 || mesh.getDimension() != 2)
 	{
 		ERR("MeshLayerMapper::createRasterLayers(): A 2D mesh and at least two rasters required as input.");
-		return nullptr;
+		return false;
 	}
 
 	MeshLib::Mesh* top (new MeshLib::Mesh(mesh));
@@ -170,7 +170,7 @@ void MeshLayerMapper::addLayerToMesh(const MeshLib::Mesh &dem_mesh, unsigned lay
         std::array<MeshLib::Node*, 6> new_elem_nodes;
         for (unsigned j=0; j<3; ++j)
         {
-            new_elem_nodes[j] = _nodes[last_layer_node_offset + elem->getNodeIndex(j)];
+            new_elem_nodes[j] = _nodes[_nodes[last_layer_node_offset + elem->getNodeIndex(j)]->getID()];
             new_elem_nodes[node_counter] = (_nodes[last_layer_node_offset + elem->getNodeIndex(j) + nNodes]);
             if (new_elem_nodes[j]->getID() != new_elem_nodes[node_counter]->getID())
                 node_counter++;