diff --git a/modules/puns.js b/modules/puns.js
index 0696866..a7cc3aa 100644
--- a/modules/puns.js
+++ b/modules/puns.js
@@ -6,7 +6,8 @@ var puns = function(dbot) {
         'listener': function(data) {
             if((dbot.db.ignores.hasOwnProperty(data.user) && 
                         dbot.db.ignores[data.user].include(name)) == false) {
-                if(dbot.moduleNames.include('quotes')) {
+                if(dbot.moduleNames.include('quotes') &&
+                        dbot.db.quotes.hasOwnProperty(data.user)) {
                     data.message = '~q ' + data.user.toLowerCase();
                     var params = data.message.split(' ');
                     dbot.commands[params[0]](data, params);