diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/CloudStackComputeService.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/CloudStackComputeService.java
index bb17cac860..32d4d599f9 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/CloudStackComputeService.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/CloudStackComputeService.java
@@ -119,7 +119,7 @@ public class CloudStackComputeService extends BaseComputeService {
                startNodeStrategy, stopNodeStrategy, templateBuilderProvider, templateOptionsProvider, nodeRunning,
                nodeTerminated, nodeSuspended, initScriptRunnerFactory, initAdminAccess, runScriptOnNodeFactory,
                persistNodeCredentials, timeouts, userExecutor, imageExtension);
-      this.zoneIdToZone = zoneIdToZone;
+      this.zoneIdToZone = checkNotNull(zoneIdToZone, "zoneIdToZone");
       this.client = checkNotNull(client, "client");
       this.securityGroupMap = checkNotNull(securityGroupMap, "securityGroupMap");
       this.keyPairCache = checkNotNull(keyPairCache, "keyPairCache");
@@ -173,7 +173,7 @@ public class CloudStackComputeService extends BaseComputeService {
    }
 
    /**
-    * returns template options, except of type {@link CloudStackTemplateOptions}.
+    * returns template options, as {@link CloudStackTemplateOptions}.
     */
    @Override
    public CloudStackTemplateOptions templateOptions() {
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java
index b4924bebd5..8f054cf8f9 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java
@@ -129,13 +129,10 @@ public class CloudStackComputeServiceContextModule extends
       }).to(CreateUniqueKeyPair.class);
       bind(new TypeLiteral<Supplier<LoadingCache<String, Zone>>>() {
       }).to(ZoneIdToZoneSupplier.class);
-
       bind(new TypeLiteral<Function<ZoneSecurityGroupNamePortsCidrs, SecurityGroup>>() {
       }).to(CreateSecurityGroupIfNeeded.class);
-
       bind(new TypeLiteral<CacheLoader<ZoneAndName, SecurityGroup>>() {
       }).to(FindSecurityGroupOrCreate.class);
-
       bind(new TypeLiteral<Function<Set<? extends NodeMetadata>,  Multimap<String, String>>>() {
       }).to(OrphanedGroupsByZoneId.class);
 
@@ -236,8 +233,8 @@ public class CloudStackComputeServiceContextModule extends
    @Provides
    @Singleton
    protected LoadingCache<String, Set<IPForwardingRule>> getIPForwardingRulesByVirtualMachine(
-      CacheLoader<String, Set<IPForwardingRule>> getIPForwardingRules) {
-      return CacheBuilder.newBuilder().build(getIPForwardingRules);
+      CacheLoader<String, Set<IPForwardingRule>> in) {
+      return CacheBuilder.newBuilder().build(in);
    }
 
 
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPair.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPair.java
index 0ae2b0501e..f225d0476d 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPair.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPair.java
@@ -31,6 +31,7 @@ import org.jclouds.cloudstack.domain.SshKeyPair;
 import org.jclouds.cloudstack.strategy.BlockUntilJobCompletesAndReturnResult;
 
 import com.google.common.base.Optional;
+import com.google.common.base.Throwables;
 import com.google.common.cache.CacheLoader;
 import com.google.inject.Inject;
 
@@ -58,7 +59,9 @@ public class CreateUniqueKeyPair extends CacheLoader<String, SshKeyPair> {
             keyPair = client.getSSHKeyPairClient().createSSHKeyPair(input);
             logger.debug(">> creating SSH key pair with name %s", input);
          } catch (IllegalStateException e) {
-            
+            logger.error(e, "<< error creating SSH key pair with name %s: ",
+                         Throwables.getRootCause(e).getMessage());
+            throw Throwables.propagate(e);
          }
       }