diff --git a/jadx-core/src/main/java/jadx/core/codegen/NameGen.java b/jadx-core/src/main/java/jadx/core/codegen/NameGen.java
index f18ac2a87d0aba07ae4b8911819d5a25ae6048e7..9764783d820b041a0bd3b2874c5aa2576309250e 100644
--- a/jadx-core/src/main/java/jadx/core/codegen/NameGen.java
+++ b/jadx-core/src/main/java/jadx/core/codegen/NameGen.java
@@ -139,7 +139,11 @@ public class NameGen {
 	}
 
 	private String getFallbackName(CodeVar var) {
-		return getFallbackName(var.getSsaVars().get(0).getAssign());
+		List<SSAVar> ssaVars = var.getSsaVars();
+		if (ssaVars.isEmpty()) {
+			return "v";
+		}
+		return getFallbackName(ssaVars.get(0).getAssign());
 	}
 
 	private String getFallbackName(RegisterArg arg) {
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/args/CodeVar.java b/jadx-core/src/main/java/jadx/core/dex/instructions/args/CodeVar.java
index 8685e487565b78923db8610b394bd449b2a43f52..a642e2e246ed6bbdaf14595457135bfd323f2af9 100644
--- a/jadx-core/src/main/java/jadx/core/dex/instructions/args/CodeVar.java
+++ b/jadx-core/src/main/java/jadx/core/dex/instructions/args/CodeVar.java
@@ -19,7 +19,9 @@ public class CodeVar {
 		var.setName(mthArg.getName());
 		var.setDeclared(true);
 		var.setThis(mthArg.isThis());
-		var.setSsaVars(Collections.singletonList(new SSAVar(mthArg.getRegNum(), 0, mthArg)));
+		SSAVar ssaVar = new SSAVar(mthArg.getRegNum(), 0, mthArg);
+		ssaVar.setCodeVar(var);
+		var.setSsaVars(Collections.singletonList(ssaVar));
 		return var;
 	}