diff --git a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/TemplateToAvailabilitySet.java b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/TemplateToAvailabilitySet.java
index bf334a0f5..141687268 100644
--- a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/TemplateToAvailabilitySet.java
+++ b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/TemplateToAvailabilitySet.java
@@ -76,7 +76,7 @@ public AvailabilitySet apply(final Template input) {
 
          if (availabilitySet != null) {
             checkArgument(location.equals(availabilitySet.location()), "The availability set %s does not belong to location %s",
-                  options.getAvailabilitySetName(), location);
+                  options.getAvailabilitySet().name(), location);
          } else {
             Map<String, String> tags = new HashMap<String, String>();
             if (options.getAvailabilitySet().tags() != null) {
diff --git a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/options/AzureTemplateOptions.java b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/options/AzureTemplateOptions.java
index 8381076ba..ec6858f3d 100644
--- a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/options/AzureTemplateOptions.java
+++ b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/options/AzureTemplateOptions.java
@@ -135,6 +135,8 @@ public Objects.ToStringHelper string() {
       toString.add("virtualNetworkName", virtualNetworkName);
       toString.add("subnetId", subnetId);
       toString.add("blob", blob);
+      toString.add("availabilitySet", availabilitySet);
+      toString.add("availabilitySetName", availabilitySetName);
       return toString;
    }