diff --git a/internal/contractgateway/smartcontractgw.go b/internal/contractgateway/smartcontractgw.go
index 922a35ec..4eb06e8b 100644
--- a/internal/contractgateway/smartcontractgw.go
+++ b/internal/contractgateway/smartcontractgw.go
@@ -1184,5 +1184,8 @@ func (g *smartContractGW) resolveAddressOrName(id string) (deployMsg *messages.D
 		ABIType: contractregistry.LocalABI,
 		Name:    info.ABI,
 	}, false)
-	return result.Contract, registeredName, info, err
+	if result != nil {
+		deployMsg = result.Contract
+	}
+	return deployMsg, registeredName, info, err
 }