diff --git a/lib/Util/Cache.js b/lib/Util/Cache.js
index cd614d175..61c13b8e3 100644
--- a/lib/Util/Cache.js
+++ b/lib/Util/Cache.js
@@ -134,7 +134,7 @@ var Cache = (function (_Array) {
 	Cache.prototype.remove = function remove(data) {
 		delete this[discrimCacheS][data[this[discrimS]]];
 		for (var i in this) {
-			if (this[i][this[discrimS]] === data[this[discrimS]]) {
+			if (this[i] && this[i][this[discrimS]] === data[this[discrimS]]) {
 				this.splice(i, 1);
 				return true;
 			}
diff --git a/src/Util/Cache.js b/src/Util/Cache.js
index 95c890884..a47204c73 100644
--- a/src/Util/Cache.js
+++ b/src/Util/Cache.js
@@ -98,7 +98,7 @@ export default class Cache extends Array {
 	remove(data) {
 		delete this[discrimCacheS][data[this[discrimS]]];
 		for(var i in this) {
-			if(this[i][this[discrimS]] === data[this[discrimS]]) {
+			if(this[i] && this[i][this[discrimS]] === data[this[discrimS]]) {
 				this.splice(i, 1);
 				return true;
 			}