diff --git a/src/server/distrend.c b/src/server/distrend.c
--- a/src/server/distrend.c
+++ b/src/server/distrend.c
@@ -164,8 +164,12 @@ int main(int argc, char *argv[])
     }
 
   /** MySQL Connection */
-  MYSQL *conn;
-  *conn = mysqlConnect();
+  struct distrend_mysql_con *conn;
+  if(mysqlConnect(&conn))
+    {
+      fprintf(stderr, "%s:%d: mysqlConnect() failed\n", __FILE__, __LINE__);
+      return 1;
+    }
 
   /** pre-loaded jobs for testing */
   prepare_distrenjob(&general_info, 1, "awesome", "LordOfWar", 8, 1, 100, 640, 480);
@@ -206,8 +210,6 @@ int main(int argc, char *argv[])
       	  clientstatus = CLIENTSTATUS_IDLE; // Sets the client back to idle
       	  finish_frame(&general_info, job, frame->num); // @TODO: Make sure this actually works.
       	}
-      	// Check the connection to the database
-      	mysqlPing(conn);
     } /* while(!general_info.config->die) */
 
   distrend_unlisten(general_info.config->listens, clients);
@@ -217,7 +219,7 @@ int main(int argc, char *argv[])
 
   /** free() paths */
   free(general_info.files.geninfo);
-  mysql_close(conn);
+  mysqlDisconnect(conn);
 
   return 0;
 }