diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create-common.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create-common.js
index 6406b557df..e389c0957e 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create-common.js
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create-common.js
@@ -171,19 +171,19 @@ define(function(require) {
     }
 
     if(
-      templateJSON["TOPOLOGY"] && 
-      templateJSON["TOPOLOGY"]["HUGEPAGE_SIZE"] !== undefined && 
-      templateJSON["TOPOLOGY"]["HUGEPAGE_SIZE"] !== null &&
-      templateJSON["TOPOLOGY"]["HUGEPAGE_SIZE"].length<=0
+      templateJSON["TOPOLOGY"] &&
+      (templateJSON["TOPOLOGY"]["HUGEPAGE_SIZE"] === undefined || 
+      templateJSON["TOPOLOGY"]["HUGEPAGE_SIZE"] === null ||
+      templateJSON["TOPOLOGY"]["HUGEPAGE_SIZE"].length<=0)
     ){
       delete templateJSON["TOPOLOGY"]["HUGEPAGE_SIZE"];
     }
 
     if(
-      templateJSON["TOPOLOGY"] && 
-      templateJSON["TOPOLOGY"]["MEMORY_ACCESS"] !== undefined && 
-      templateJSON["TOPOLOGY"]["MEMORY_ACCESS"] !== null &&
-      templateJSON["TOPOLOGY"]["MEMORY_ACCESS"].length<=0
+      templateJSON["TOPOLOGY"] &&
+      (templateJSON["TOPOLOGY"]["MEMORY_ACCESS"] === undefined || 
+      templateJSON["TOPOLOGY"]["MEMORY_ACCESS"] === null ||
+      templateJSON["TOPOLOGY"]["MEMORY_ACCESS"].length<=0)
     ){
       delete templateJSON["TOPOLOGY"]["MEMORY_ACCESS"];
     }