From f11341c0b4057e530a045c22d007b2d9aadf24c8 Mon Sep 17 00:00:00 2001
From: Adrien Delorme <adrien.delorme@icloud.com>
Date: Thu, 29 Aug 2019 10:34:59 +0200
Subject: [PATCH 1/2] azure builder: avoid a panic in getObjectIdFromToken

---
 builder/azure/arm/builder.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/builder/azure/arm/builder.go b/builder/azure/arm/builder.go
index 2be58819d..2a0c37d39 100644
--- a/builder/azure/arm/builder.go
+++ b/builder/azure/arm/builder.go
@@ -439,8 +439,9 @@ func getObjectIdFromToken(ui packer.Ui, token *adal.ServicePrincipalToken) strin
 		ui.Error(fmt.Sprintf("Failed to parse the token,Error: %s", err.Error()))
 		return ""
 	}
-	return claims["oid"].(string)
 
+	oid, _ := claims["oid"].(string)
+	return oid
 }
 
 func normalizeAzureRegion(name string) string {

From b6eadb419afd3b6bd5acac65bd894a70965b70c6 Mon Sep 17 00:00:00 2001
From: Lars Lehtonen <lars.lehtonen@gmail.com>
Date: Thu, 29 Aug 2019 05:13:46 -0700
Subject: [PATCH 2/2] builder/qemu: Fix dropped error

---
 builder/qemu/step_run.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/builder/qemu/step_run.go b/builder/qemu/step_run.go
index 55390168c..1a5001caf 100644
--- a/builder/qemu/step_run.go
+++ b/builder/qemu/step_run.go
@@ -96,6 +96,9 @@ func getCommandArgs(bootDrive string, state multistep.StateBag) ([]string, error
 		return nil, err
 	}
 	qemuVersion, err := version.NewVersion(rawVersion)
+	if err != nil {
+		return nil, err
+	}
 	v2 := version.Must(version.NewVersion("2.0"))
 
 	if qemuVersion.GreaterThanOrEqual(v2) {