diff --git a/TheButtonAutoFlair.jar b/TheButtonAutoFlair.jar
index 2363cc6..7b67752 100644
Binary files a/TheButtonAutoFlair.jar and b/TheButtonAutoFlair.jar differ
diff --git a/src/tk/sznp/thebuttonautoflair/Commands.java b/src/tk/sznp/thebuttonautoflair/Commands.java
index 9d1d179..76d8f74 100644
--- a/src/tk/sznp/thebuttonautoflair/Commands.java
+++ b/src/tk/sznp/thebuttonautoflair/Commands.java
@@ -154,7 +154,7 @@ public class Commands implements CommandExecutor {
 					MaybeOfflinePlayer mp = MaybeOfflinePlayer
 							.GetFromName(args[1]);
 					if (mp == null) {
-						player.sendMessage("§cUnknown user: " + args[1]);
+						player.sendMessage("§cUnknown user (player has to be online): " + args[1]);
 						break;
 					}
 					player.sendMessage("§bUsername of " + args[1] + ": "
@@ -443,7 +443,7 @@ public class Commands implements CommandExecutor {
 		}
 		MaybeOfflinePlayer p = MaybeOfflinePlayer.GetFromName(args[2]);
 		if (p == null) {
-			String message = "§cPlayer not found: " + args[2] + "§r";
+			String message = "§cPlayer not found: " + args[2] + " - Currently only online players can be viewed§r";
 			SendMessage(player, message);
 			return;
 		}
diff --git a/src/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.java b/src/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.java
index 4f7fb61..5d63dc9 100644
--- a/src/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.java
+++ b/src/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.java
@@ -61,6 +61,8 @@ public class MaybeOfflinePlayer {
 			String tmp = cs2.getString("flairtime");
 			if (tmp.equals("--"))
 				mp.FlairTime = FlairTimeNonPresser;
+			else if (tmp.equals("??"))
+				mp.FlairTime = FlairTimeCantPress;
 			else if (tmp.length() > 0)
 				mp.FlairTime = Short.parseShort(tmp);
 			String flairstate = cs2.getString("flairstate");
@@ -93,7 +95,11 @@ public class MaybeOfflinePlayer {
 	}
 
 	public static MaybeOfflinePlayer GetFromName(String name) {
-		return AllPlayers.get(Bukkit.getPlayer(name).getUniqueId());
+		Player p = Bukkit.getPlayer(name);
+		if (p != null)
+			return AllPlayers.get(p.getUniqueId());
+		else
+			return null;
 	}
 
 	public String GetFormattedFlair() {