diff --git a/Source/wall.f90 b/Source/wall.f90
index e742940b1a..6e6469ee6a 100644
--- a/Source/wall.f90
+++ b/Source/wall.f90
@@ -2505,7 +2505,7 @@ SUBROUTINE SOLID_HEAT_TRANSFER(NM,T,DT_BC,PARTICLE_INDEX,WALL_INDEX,CFACE_INDEX,
       CELL_ZERO_CELL = .FALSE.
       LAYER_THICKNESS_CHECK: DO NL=1,ONE_D%N_LAYERS
          ONE_D%LAYER_THICKNESS(NL) = X_S_NEW(I+ONE_D%N_LAYER_CELLS(NL)) - X_S_NEW(I)
-         IF (ONE_D%N_LAYER_CELLS(NL) == 0) CYCLE
+         IF (ONE_D%N_LAYER_CELLS(NL) == 0) CYCLE LAYER_THICKNESS_CHECK
          IF (ONE_D%LAYER_THICKNESS(NL) <= ONE_D%MIN_LAYER_THICKNESS(NL) .OR. LAYER_MASS(NL) <= ONE_D%MIN_LAYER_MASS(NL)) THEN
             CELL_ZERO_CELL(I+1:I+ONE_D%N_LAYER_CELLS(NL)) = .TRUE.
             ONE_D%N_LAYER_CELLS(NL)=0
@@ -2585,7 +2585,8 @@ SUBROUTINE SOLID_HEAT_TRANSFER(NM,T,DT_BC,PARTICLE_INDEX,WALL_INDEX,CFACE_INDEX,
 
       ! Some node changes size but no layer trips remesh check. Just redo node weight with X_S_NEW      
      
-      IF (REMESH_CHECK .AND. ALL(.NOT. REMESH_LAYER(1:ONE_D%N_LAYERS))) THEN
+      IF (REMESH_CHECK .AND. ALL(.NOT.REMESH_LAYER(1:ONE_D%N_LAYERS)) .AND. &
+         SUM(ONE_D%LAYER_THICKNESS(1:ONE_D%N_LAYERS))>TWENTY_EPSILON_EB) THEN
          CALL GET_WALL_NODE_WEIGHTS(NWP,ONE_D%N_LAYERS,ONE_D%N_LAYER_CELLS(1:ONE_D%N_LAYERS), &
                                    ONE_D%LAYER_THICKNESS(1:ONE_D%N_LAYERS),SF%GEOMETRY,X_S_NEW(0:NWP),LAYER_DIVIDE,DX_S(1:NWP), &
                                    RDX_S(0:NWP+1),RDXN_S(0:NWP),DX_WGT_S(0:NWP),DXF,DXB,LAYER_INDEX(0:NWP+1),MF_FRAC(1:NWP),&