diff --git a/src/com/projectkorra/projectkorra/waterbending/SurgeWall.java b/src/com/projectkorra/projectkorra/waterbending/SurgeWall.java
index 7e7d9ab7..86436230 100644
--- a/src/com/projectkorra/projectkorra/waterbending/SurgeWall.java
+++ b/src/com/projectkorra/projectkorra/waterbending/SurgeWall.java
@@ -352,7 +352,9 @@ public class SurgeWall extends WaterAbility {
 				if (!GeneralMethods.isAdjacentToThreeOrMoreSources(block)) {
 					if (this.oldTemps.containsKey(block)) {
 						final TempBlock tb = TempBlock.get(block);
-						tb.setType(this.oldTemps.get(block));
+						if (tb != null) {
+							tb.setType(this.oldTemps.get(block));
+						}
 					} else {
 						TempBlock.revertBlock(block, Material.AIR);
 					}
@@ -367,7 +369,9 @@ public class SurgeWall extends WaterAbility {
 			if (AFFECTED_BLOCKS.containsKey(block)) {
 				if (this.oldTemps.containsKey(block)) {
 					final TempBlock tb = TempBlock.get(block);
-					tb.setType(this.oldTemps.get(block));
+					if (tb != null) {
+						tb.setType(this.oldTemps.get(block));
+					}
 				} else {
 					TempBlock.revertBlock(block, Material.AIR);
 				}