diff --git a/Horse Isle Server/HorseIsleServer/Game/Meta.cs b/Horse Isle Server/HorseIsleServer/Game/Meta.cs
index f961a1e..410898c 100755
--- a/Horse Isle Server/HorseIsleServer/Game/Meta.cs	
+++ b/Horse Isle Server/HorseIsleServer/Game/Meta.cs	
@@ -2016,13 +2016,16 @@ namespace HISP.Game
                 message += Messages.MetaTerminator;
                 return message;
             }
-            Riddler riddle = Riddler.GetRandomRiddle(user);
-            user.LastRiddle = riddle;
-            
-            message += Messages.FormatRiddlerRiddle(riddle.Riddle);
-            message += Messages.ExitThisPlace;
-            message += Messages.MetaTerminator;
-            return message;
+            else
+            {
+                Riddler riddle = Riddler.GetRandomRiddle(user);
+                user.LastRiddle = riddle;
+
+                message += Messages.FormatRiddlerRiddle(riddle.Riddle);
+                message += Messages.ExitThisPlace;
+                message += Messages.MetaTerminator;
+                return message;
+            }
         }
 
        
diff --git a/Horse Isle Server/HorseIsleServer/Game/Riddler.cs b/Horse Isle Server/HorseIsleServer/Game/Riddler.cs
index 19bdbc8..3bed926 100644
--- a/Horse Isle Server/HorseIsleServer/Game/Riddler.cs	
+++ b/Horse Isle Server/HorseIsleServer/Game/Riddler.cs	
@@ -61,7 +61,7 @@ namespace HISP.Game
 
         public static bool HasCompletedAllRiddles(User user)
         {
-            if (Database.TotalRiddlesCompletedByPlayer(user.Id) > Riddles.Length)
+            if (Database.TotalRiddlesCompletedByPlayer(user.Id) >= Riddles.Length)
                 return true;
             return false;
         }