diff --git a/Cargo.lock b/Cargo.lock
index 4602ff7..52e0413 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -822,7 +822,7 @@ dependencies = [
 
 [[package]]
 name = "kon"
-version = "0.1.14"
+version = "0.1.15"
 dependencies = [
  "cargo_toml",
  "gamedig",
diff --git a/Cargo.toml b/Cargo.toml
index cf19a79..30e2c29 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "kon"
-version = "0.1.14"
+version = "0.1.15"
 rust-version = "1.74"
 edition = "2021"
 
diff --git a/src/commands/gameserver.rs b/src/commands/gameserver.rs
index 2ead341..60464a5 100644
--- a/src/commands/gameserver.rs
+++ b/src/commands/gameserver.rs
@@ -94,7 +94,7 @@ pub async fn add(
           msg.edit(
             ctx,
             serenity_prelude::EditMessage::new()
-              .content(format!("*Error adding server to database: {:?}*", y))
+              .content(format!("*Error adding server to database:\n`{}`*", y))
               .embeds(Vec::new())
               .components(Vec::new())
           ).await?;
@@ -166,7 +166,7 @@ pub async fn remove(
           msg.edit(
             ctx,
             serenity_prelude::EditMessage::new()
-              .content(format!("*Error removing server from database: {:?}*", y))
+              .content(format!("*Error removing server from database:\n`{}`*", y))
               .embeds(Vec::new())
               .components(Vec::new())
           ).await?;
diff --git a/src/controllers/database.rs b/src/controllers/database.rs
index 38c0d33..38e0074 100644
--- a/src/controllers/database.rs
+++ b/src/controllers/database.rs
@@ -23,10 +23,11 @@ impl DatabaseController {
     // Gameservers
     client.batch_execute("
       CREATE TABLE IF NOT EXISTS gameservers (
-        server_name VARCHAR(255) NOT NULL PRIMARY KEY,
+        server_name VARCHAR(255) NOT NULL,
         game_name VARCHAR(255) NOT NULL,
         guild_owner BIGINT NOT NULL,
-        ip_address VARCHAR(255) NOT NULL
+        ip_address VARCHAR(255) NOT NULL,
+        PRIMARY KEY (server_name, guild_owner)
       );
     ").await?;