diff --git a/.gitignore b/.gitignore
index b32bd32fb..cec4815ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -190,3 +190,4 @@ UpgradeLog*.htm
 
 # Microsoft Fakes
 FakesAssemblies/
+src/.idea
diff --git a/src/React.Core/Resources/shims.js b/src/React.Core/Resources/shims.js
index f99e4f264..166f41f28 100644
--- a/src/React.Core/Resources/shims.js
+++ b/src/React.Core/Resources/shims.js
@@ -19,7 +19,7 @@ MockConsole.prototype = {
 	_handleCall: function(methodName/*, ...args*/) {
 		var serializedArgs = [];
 		for (var i = 1; i < arguments.length; i++) {
-			serializedArgs.push(JSON.stringify(arguments[i]));
+			serializedArgs.push(typeof arguments[i] === 'undefined' ? 'undefined' : JSON.stringify(arguments[i]));
 		}
 
 		this._calls.push({