diff --git a/package.json b/package.json
index 28d45bb0..1adf3ff5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "shout",
   "description": "A web IRC client",
-  "version": "0.31.1",
+  "version": "0.31.2",
   "author": "Mattias Erming",
   "preferGlobal": true,
   "bin": {
diff --git a/src/client.js b/src/client.js
index 9ca62303..9b48a90d 100644
--- a/src/client.js
+++ b/src/client.js
@@ -74,7 +74,7 @@ Client.prototype.emit = function(event, data) {
 	if (this.sockets !== null) {
 		this.sockets.in(this.id).emit(event, data);
 	}
-	if (this.config.log === true) {
+	if ((this.config || {}).log === true) {
 		if (event == "msg") {
 			var target = this.find(data.chan);
 			if (target) {