diff --git a/controllers/player.py b/controllers/player.py
index 86b467c11531fb588bbfddc894ff46299122ad91..5ebbf06ddba95e57c3376869c21e1a62314da3ab 100644
--- a/controllers/player.py
+++ b/controllers/player.py
@@ -25,6 +25,9 @@ def create():
 
     players = PLAYERS_GET(room_record)
 
+    if len(players) >= room_record["player_max"]:
+        return(FAIL(CODE_NOTFOUND))
+
     for player in players:
         if player["name"] == user_name:
             return(FAIL(CODE_CONFLICT))
diff --git a/views/default/index.html b/views/default/index.html
index 17da2c149a9a8d255b049a514a132e05045d2095..bbfaf6ddcd7d9c5e2a23790a8f8188feece5f359 100644
--- a/views/default/index.html
+++ b/views/default/index.html
@@ -26,7 +26,7 @@
                 case 200:
                     break;
                 case 404:
-                    $("#form_login_error").html("Room could not be found.");
+                    $("#form_login_error").html("Room not found or full.");
                     break;
                 case 409:
                     $("#form_login_error").html("Please choose a different user name.");
@@ -34,6 +34,9 @@
                 case 422:
                     $("#form_login_error").html("Please provide valid values.");
                     break;
+                case 500:
+                    $("#form_login_error").html("500 - Internal Server Error");
+                    break;
                 default:
                     $("#form_login_error").html("Error "+_code);
             }