diff --git a/src/core/Game.js b/src/core/Game.js
index f6dbc4f71..7a221f244 100644
--- a/src/core/Game.js
+++ b/src/core/Game.js
@@ -138,7 +138,7 @@ Phaser.Game = function (width, height, renderer, parent, state, transparent, ant
     this.load = null;
 
     /**
-	* @property {Phaser.GameMath} math - Reference to the math helper.
+	* @property {Phaser.Math} math - Reference to the math helper.
 	* @default
 	*/
     this.math = null;
diff --git a/src/core/State.js b/src/core/State.js
index e202c9491..a853b945e 100644
--- a/src/core/State.js
+++ b/src/core/State.js
@@ -50,7 +50,7 @@ Phaser.State = function () {
     this.load = null;
     
     /**
-	* @property {Phaser.GameMath} math - Reference to the math helper.
+	* @property {Phaser.Math} math - Reference to the math helper.
 	* @default
 	*/
     this.math = null;
diff --git a/src/loader/Loader.js b/src/loader/Loader.js
index dabdcb50c..44c1f80a7 100644
--- a/src/loader/Loader.js
+++ b/src/loader/Loader.js
@@ -744,6 +744,10 @@ Phaser.Loader.prototype = {
 						return _this.csvLoadComplete(file.key);
 					};
 				}
+				else
+				{
+					throw new Error("Phaser.Loader. Invalid Tilemap format: " + file.format);
+				}
 
 				this._xhr.onerror = function () {
 					return _this.dataLoadError(file.key);
@@ -873,6 +877,10 @@ Phaser.Loader.prototype = {
 							return _this.xmlLoadComplete(file.key);
 						};
 					}
+					else
+					{
+						throw new Error("Phaser.Loader. Invalid Texture Atlas format: " + file.format);
+					}
 
 					this._xhr.onerror = function () {
 						return _this.dataLoadError(file.key);
@@ -1105,4 +1113,4 @@ Phaser.Loader.prototype = {
 
 	}
 
-};
\ No newline at end of file
+};
diff --git a/src/math/Math.js b/src/math/Math.js
index 45e3cb100..0c993a09b 100644
--- a/src/math/Math.js
+++ b/src/math/Math.js
@@ -350,7 +350,7 @@ Phaser.Math = {
 
         if (typeof radians === "undefined") { radians = true; }
 
-        var rd = (radians) ? GameMath.PI : 180;
+        var rd = (radians) ? Math.PI : 180;
         return this.wrap(angle, rd, -rd);
         
     },