diff --git a/src/com/projectkorra/ProjectKorra/waterbending/OctopusForm.java b/src/com/projectkorra/ProjectKorra/waterbending/OctopusForm.java
index f129b416..02bda24a 100644
--- a/src/com/projectkorra/ProjectKorra/waterbending/OctopusForm.java
+++ b/src/com/projectkorra/ProjectKorra/waterbending/OctopusForm.java
@@ -227,8 +227,9 @@ public class OctopusForm {
 					sourcelocation.add(vector);
 					Block newblock = sourcelocation.getBlock();
 					if (!newblock.equals(sourceblock)) {
-						source.revertBlock();
-						source = null;
+						if (source != null) {
+							source.revertBlock();
+						}
 						if (!GeneralMethods.isSolid(newblock)) {
 							source = new TempBlock(newblock, Material.STATIONARY_WATER, (byte) 8);
 							sourceblock = newblock;