diff --git a/register.php b/register.php
index cdb9d3f..7747dc1 100644
--- a/register.php
+++ b/register.php
@@ -17,8 +17,11 @@
         $error = 11101;
     } else {
         $database->query('INSERT INTO "Users" ("name", "ID") VALUES  ($1, $2);', array($name, $uid));
-        echo pg_last_error();
-        $data = array('uid'=>$uid, 'name'=>$name);
+        if(preg_match('/violates unique constraint "Users_name"/', pg_last_error()) == 1) {
+            echo 'name taken';
+        } else {
+            $data = array('uid' => $uid, 'name' => $name);
+        }
     }
     $response = Database::create_response($data, $error);
     print $response;