diff --git a/models/helpers.ts b/models/helpers.ts
index 024fcda6..4f95ef57 100644
--- a/models/helpers.ts
+++ b/models/helpers.ts
@@ -170,7 +170,7 @@ export function getMakeReturnDocAction(fyo: Fyo): Action {
       doc.isSubmitted &&
       !doc.isReturn,
     action: async (doc: Doc) => {
-      const returnDoc = await (doc as StockTransfer).getReturnDoc();
+      const returnDoc = await (doc as StockTransfer)?.getReturnDoc();
       if (!returnDoc || !returnDoc.name) {
         return;
       }
diff --git a/schemas/app/Address.json b/schemas/app/Address.json
index e0b3ecda..965029ea 100644
--- a/schemas/app/Address.json
+++ b/schemas/app/Address.json
@@ -83,8 +83,8 @@
     "addressLine1",
     "addressLine2",
     "city",
-    "state",
     "country",
+    "state",
     "postalCode"
   ],
   "linkDisplayField": "addressDisplay"
diff --git a/schemas/regional/in/Address.json b/schemas/regional/in/Address.json
index 2a0460a0..3ad00dfa 100644
--- a/schemas/regional/in/Address.json
+++ b/schemas/regional/in/Address.json
@@ -13,8 +13,8 @@
     "addressLine1",
     "addressLine2",
     "city",
-    "state",
     "country",
+    "state",
     "postalCode",
     "pos"
   ]