diff --git a/src/com/massivecraft/factions/cmd/type/TypeFaction.java b/src/com/massivecraft/factions/cmd/type/TypeFaction.java index d1c96fd9..e6c33bf6 100644 --- a/src/com/massivecraft/factions/cmd/type/TypeFaction.java +++ b/src/com/massivecraft/factions/cmd/type/TypeFaction.java @@ -66,10 +66,13 @@ public class TypeFaction extends TypeAbstract // MPlayer Name Exact String id = IdUtil.getId(str); - MPlayer mplayer = MPlayerColl.get().get(id, false); - if (mplayer != null) + if (id != null) { - return mplayer.getFaction(); + MPlayer mplayer = MPlayerColl.get().get(id, false); + if (mplayer != null) + { + return mplayer.getFaction(); + } } throw new MassiveException().addMsg("No faction or player matching \"

%s\".", str);