diff --git a/src/net/TheDgtl/Stargate/Portal.java b/src/net/TheDgtl/Stargate/Portal.java
index cfff89c..32c9dfd 100644
--- a/src/net/TheDgtl/Stargate/Portal.java
+++ b/src/net/TheDgtl/Stargate/Portal.java
@@ -1454,6 +1454,9 @@ public class Portal {
 	}
 
 	public static String filterName(String input) {
+		if (input == null) {
+			return "";
+		}
 		return input.replaceAll("[\\|:#]", "").trim();
 	}
 	
diff --git a/src/net/TheDgtl/Stargate/Stargate.java b/src/net/TheDgtl/Stargate/Stargate.java
index 7409d4a..d926b52 100644
--- a/src/net/TheDgtl/Stargate/Stargate.java
+++ b/src/net/TheDgtl/Stargate/Stargate.java
@@ -895,6 +895,8 @@ public class Stargate extends JavaPlugin {
 			Player player = event.getPlayer();
 			Block block = event.getClickedBlock();
 
+			if(block == null) return;
+
 			// Right click
 			if (event.getAction() == Action.RIGHT_CLICK_BLOCK) {
 				if (block.getBlockData() instanceof WallSign) {