diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/functions/URIParser.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/functions/URIParser.java index f67e7e295c..5493f04f36 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/functions/URIParser.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/functions/URIParser.java @@ -28,9 +28,9 @@ import com.google.common.base.Function; @Singleton public class URIParser implements Function { public URI apply(final HttpResponse from) { - if (from.getStatusCode() == 202 && from.getHeaders().containsKey("Location")){ - String uri = from.getFirstHeaderOrNull("Location"); - return URI.create(uri); + String locationUri; + if (from.getStatusCode() == 202 && (locationUri = from.getFirstHeaderOrNull("Location")) != null){ + return URI.create(locationUri); } else if (from.getStatusCode() == 200 || from.getStatusCode() == 204){ return null;