diff --git a/lib/mysql.js b/lib/mysql.js
index 90eb712..f8a7caa 100644
--- a/lib/mysql.js
+++ b/lib/mysql.js
@@ -26,7 +26,7 @@ exports.initialize = function initializeSchema(schema, callback) {
     
     // schema.client.query('SET TIME_ZONE = "+04:00"', callback);
     schema.client.query('USE `' + s.database + '`', function (err) {
-        if (err && err.message.match(/^unknown database/i)) {
+        if (err && err.message.match(/(^|: )unknown database/i)) {
             var dbName = s.database;
             schema.client.query('CREATE DATABASE ' + dbName, function (error) {
                 if (!error) {
@@ -66,8 +66,8 @@ MySQL.prototype.query = function (sql, callback) {
     var log = this.log;
     if (typeof callback !== 'function') throw new Error('callback should be a function');
     this.client.query(sql, function (err, data) {
-        if (err && err.message.match(/^unknown database/i)) {
-            var dbName = err.message.match(/^unknown database '(.*?)'/i)[1];
+        if (err && err.message.match(/(^|: )unknown database/i)) {
+            var dbName = err.message.match(/(^|: )unknown database '(.*?)'/i)[1];
             client.query('CREATE DATABASE ' + dbName, function (error) {
                 if (!error) {
                     client.query(sql, callback);