diff --git a/addform.html b/addform.html
index a0b42ad..42deb88 100644
--- a/addform.html
+++ b/addform.html
@@ -4245,7 +4245,7 @@ function check_Empty_Question()
 		 if (index === array.length - 1) {
 		var idclass= document.getElementById(Id).className;
 		// console.log(idclass == "QuestionTextIdSet SerialNo");
-		if ( idclass === 'QuestionTextIdSet SerialNo' || idclass === 'QuestionsGroupIdset' || idclass === 'QuestionChoiceId' ) {
+		if ( idclass === 'QuestionTextIdSet SerialNo' || idclass === 'QuestionsGroupIdset' || idclass === 'QuestionChoiceId SerialNo' ) {
 			attrId = document.getElementById(Id).innerHTML
 		}else if(idclass === 'multipleAnswerorNot'){ 
 			attrId ="";
@@ -5215,10 +5215,10 @@ setInterval(imagebuttonidset,3000)
 <script>
 
 		function sendthe_full_div_for_multiple_or_not(params) {
-			var aa= document.querySelectorAll('.multipleAnswerorNot')
-			if (aa) {
-				aa.forEach(function (pa) {
-					var fullParentDiv = pa.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode
+			var multipleAnswerElements=document.querySelectorAll('.multipleAnswerorNot')
+			if (multipleAnswerElements) {
+				multipleAnswerElements.forEach(function (multipleAnswerElement) {
+					var fullParentDiv = multipleAnswerElement.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode
 					getidoffulldiv(fullParentDiv)
 					radioButtonselectOne(fullParentDiv)
 					checkChoicesNotSelect(fullParentDiv)
@@ -5293,6 +5293,7 @@ setInterval(imagebuttonidset,3000)
 <!-- Start the Choice Question Mandatory Check   -->
 <script>
 	function checkChoicesNotSelect(element){
+		// console.log(element);
 		var ChoiceChecks  =element.querySelectorAll('.correctAnswerBox')
 		var count =0;
 		var array_of_Ids =[];
@@ -5306,7 +5307,7 @@ setInterval(imagebuttonidset,3000)
 			var title_i = localStorage.getItem('JSON_FOR_EMPTY_QUESTION');
     		var parsedArra = JSON.parse(title_i);
   			var againpushlist =[];
-			if (parsedArra.length != 0) {
+			if (parsedArra !== null && parsedArra.length !== undefined && parsedArra.length !== 0) {
 
 				parsedArra.forEach(function (para,index){