diff --git a/system/services/forms/FormsService.cfc b/system/services/forms/FormsService.cfc
index c4123bec7..cd5db8ec8 100644
--- a/system/services/forms/FormsService.cfc
+++ b/system/services/forms/FormsService.cfc
@@ -1391,6 +1391,10 @@ component displayName="Forms service" {
 				continue;
 			}
 
+			if ( !StructKeyExists( matchingTab, "fieldsets" ) ) {
+				matchingTab.fieldsets = [];
+			}
+
 			for( var fieldSet in tab.fieldSets ){
 				var matchingFieldset = {};
 				if ( Len( Trim( fieldSet.id ?: "" ) ) ) {
@@ -1409,6 +1413,10 @@ component displayName="Forms service" {
 					continue;
 				}
 
+				if ( !StructKeyExists( matchingFieldset, "fields" ) ) {
+					matchingFieldset.fields = [];
+				}
+
 				for( var field in fieldset.fields ) {
 					var fieldMatched = false;
 					var fieldDeleted = false;