diff --git a/api/js/etemplate/et2_extension_nextmatch.js b/api/js/etemplate/et2_extension_nextmatch.js
index 0b95f1736e..ba6a207346 100644
--- a/api/js/etemplate/et2_extension_nextmatch.js
+++ b/api/js/etemplate/et2_extension_nextmatch.js
@@ -233,8 +233,14 @@ var et2_nextmatch = (function(){ "use strict"; return et2_DOMWidget.extend([et2_
 
 		// Free the grid components
 		this.dataview.free();
-		this.rowProvider.free();
-		this.controller.free();
+		if(this.rowProvider)
+		{
+			this.rowProvider.free();
+		}
+		if(this.controller)
+		{
+			this.controller.free();
+		}
 		this.dynheight.free();
 
 		this._super.apply(this, arguments);