diff --git a/ShowByCondition/src/ShowByCondition/widget/ShowByCondition.js b/ShowByCondition/src/ShowByCondition/widget/ShowByCondition.js
index 7ef0838..9b457a0 100644
--- a/ShowByCondition/src/ShowByCondition/widget/ShowByCondition.js
+++ b/ShowByCondition/src/ShowByCondition/widget/ShowByCondition.js
@@ -114,7 +114,9 @@ define([
             // Release handles on previous object, if any.
             if (this._handles) {
                 this._handles.forEach(function (handle, i) {
-                    mx.data.unsubscribe(handle);
+                    if (typeof handle != 'undefined') {
+                    	mx.data.unsubscribe(handle);
+					}
                 });
                 this._handles = [];
             }