Null pointer check for Perm 2.7.4 prefix/suffix

1 files changed, 5 insertions, 4 deletions

diff --git a/Essentials/src/com/earth2me/essentials/Permissions2Handler.java b/Essentials/src/com/earth2me/essentials/Permissions2Handler.java
index c588bb5fa..23353c643 100644
--- a/Essentials/src/com/earth2me/essentials/Permissions2Handler.java
+++ b/Essentials/src/com/earth2me/essentials/Permissions2Handler.java
@@ -9,7 +9,7 @@ import org.bukkit.plugin.Plugin;
 public class Permissions2Handler implements IPermissionsHandler
 {
 	private final transient PermissionHandler permissionHandler;
-	
+
 	Permissions2Handler(final Plugin permissionsPlugin)
 	{
 		permissionHandler = ((Permissions)permissionsPlugin).getHandler();
@@ -37,12 +37,13 @@ public class Permissions2Handler implements IPermissionsHandler
 
 	public String getPrefix(final Player base)
 	{
-		return permissionHandler.getGroupPrefix(base.getWorld().getName(), getGroup(base));
+		final String prefix = permissionHandler.getGroupPrefix(base.getWorld().getName(), getGroup(base));
+		return prefix == null ? "" : prefix;
 	}
 
 	public String getSuffix(final Player base)
 	{
-		return permissionHandler.getGroupSuffix(base.getWorld().getName(), getGroup(base));
+		final String suffix = permissionHandler.getGroupSuffix(base.getWorld().getName(), getGroup(base));
+		return suffix == null ? "" : suffix;
 	}
-	
 }