diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/compute/functions/RunningInstanceToNodeMetadata.java b/aws/core/src/main/java/org/jclouds/aws/ec2/compute/functions/RunningInstanceToNodeMetadata.java
index 8df5c22c28..4d1fbf7747 100644
--- a/aws/core/src/main/java/org/jclouds/aws/ec2/compute/functions/RunningInstanceToNodeMetadata.java
+++ b/aws/core/src/main/java/org/jclouds/aws/ec2/compute/functions/RunningInstanceToNodeMetadata.java
@@ -251,8 +251,13 @@ public class RunningInstanceToNodeMetadata implements Function<RunningInstance,
 
    @VisibleForTesting
    String getLoginAccountFor(RunningInstance from) {
-      org.jclouds.aws.ec2.domain.Image image = Iterables.getOnlyElement(client.getAMIServices().describeImagesInRegion(
-               from.getRegion(), DescribeImagesOptions.Builder.imageIds(from.getImageId())));
+      org.jclouds.aws.ec2.domain.Image image = null;
+      try {
+         image = Iterables.getOnlyElement(client.getAMIServices().describeImagesInRegion(from.getRegion(),
+                  DescribeImagesOptions.Builder.imageIds(from.getImageId())));
+      } catch (NoSuchElementException e) {
+         logger.debug("couldn't find image %s/%s", from.getRegion(), from.getImageId());
+      }
       return checkNotNull(credentialProvider.execute(image), "login from image: " + from.getImageId()).identity;
    }
 
diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/compute/strategy/EC2PopulateDefaultLoginCredentialsForImageStrategy.java b/aws/core/src/main/java/org/jclouds/aws/ec2/compute/strategy/EC2PopulateDefaultLoginCredentialsForImageStrategy.java
index 2e3d55e21c..f0e215a9dc 100644
--- a/aws/core/src/main/java/org/jclouds/aws/ec2/compute/strategy/EC2PopulateDefaultLoginCredentialsForImageStrategy.java
+++ b/aws/core/src/main/java/org/jclouds/aws/ec2/compute/strategy/EC2PopulateDefaultLoginCredentialsForImageStrategy.java
@@ -42,9 +42,8 @@ public class EC2PopulateDefaultLoginCredentialsForImageStrategy implements
       Image image = (Image) resourceToAuthenticate;
 
       Credentials credentials;
-
       // canonical/alestic images use the ubuntu user to login
-      if (image.getImageOwnerId().matches("063491364108|099720109477"))
+      if (image != null && image.getImageOwnerId().matches("063491364108|099720109477"))
          credentials = new Credentials("ubuntu", null);
       else
          credentials = new Credentials("root", null);
diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/compute/functions/RunningInstanceToNodeMetadataTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/compute/functions/RunningInstanceToNodeMetadataTest.java
index 70dde54c61..0d08541e6d 100644
--- a/aws/core/src/test/java/org/jclouds/aws/ec2/compute/functions/RunningInstanceToNodeMetadataTest.java
+++ b/aws/core/src/test/java/org/jclouds/aws/ec2/compute/functions/RunningInstanceToNodeMetadataTest.java
@@ -259,6 +259,91 @@ public class RunningInstanceToNodeMetadataTest {
 
    }
 
+
+   @SuppressWarnings( { "unchecked", "rawtypes" })
+   @Test
+   public void testApplyForEucalyptusWhereImageNotFound() throws UnknownHostException {
+      EC2Client client = createMock(EC2Client.class);
+      AMIClient amiClient = createMock(AMIClient.class);
+      expect(client.getAMIServices()).andReturn(amiClient).atLeastOnce();
+      Map<RegionAndName, KeyPair> credentialsMap = createMock(Map.class);
+      ConcurrentMap<RegionAndName, org.jclouds.compute.domain.Image> imageMap = createMock(ConcurrentMap.class);
+      Supplier<Set<? extends Hardware>> hardwares = Suppliers.<Set<? extends Hardware>> ofInstance(ImmutableSet
+               .<Hardware> of(EC2Hardware.M1_SMALL));
+      PopulateDefaultLoginCredentialsForImageStrategy credentialProvider = createMock(PopulateDefaultLoginCredentialsForImageStrategy.class);
+      RunningInstance instance = createMock(RunningInstance.class);
+
+      expect(instance.getId()).andReturn("i-3d640055").atLeastOnce();
+      expect(instance.getGroupIds()).andReturn(ImmutableSet.<String> of()).atLeastOnce();
+      expect(instance.getKeyName()).andReturn("nebulatanimislam").atLeastOnce();
+      expect(instance.getInstanceState()).andReturn(InstanceState.RUNNING);
+
+      Location region = new LocationImpl(LocationScope.REGION, "us-east-1", "description", null);
+      Supplier<Set<? extends Location>> locations = Suppliers.<Set<? extends Location>> ofInstance(ImmutableSet
+               .<Location> of(region));
+      org.jclouds.compute.domain.Image jcImage = createMock(org.jclouds.compute.domain.Image.class);
+
+      expect(instance.getIpAddress()).andReturn(null);
+      expect(instance.getPrivateIpAddress()).andReturn("10.202.117.241");
+
+      expect(instance.getRegion()).andReturn(Region.US_EAST_1).atLeastOnce();
+
+      expect(jcImage.getOperatingSystem()).andReturn(createMock(OperatingSystem.class)).atLeastOnce();
+
+      expect(instance.getImageId()).andReturn("ami-1515f07c").atLeastOnce();
+      expect(imageMap.get(new RegionAndName(Region.US_EAST_1, "ami-1515f07c"))).andReturn(jcImage);
+
+      expect(amiClient.describeImagesInRegion(Region.US_EAST_1, imageIds("ami-1515f07c"))).andReturn(
+               (Set) ImmutableSet.<Image> of());
+      
+      expect(credentialProvider.execute(null)).andReturn(new Credentials("root", null));
+
+
+      expect(credentialsMap.get(new RegionAndName(Region.US_EAST_1, "nebulatanimislam"))).andReturn(null);
+
+      expect(instance.getAvailabilityZone()).andReturn(null).atLeastOnce();
+
+      expect(instance.getInstanceType()).andReturn(InstanceType.M1_SMALL).atLeastOnce();
+      expect(instance.getEbsBlockDevices()).andReturn(Maps.<String, EbsBlockDevice> newHashMap());
+      expect(instance.getRootDeviceType()).andReturn(RootDeviceType.INSTANCE_STORE);
+
+      replay(imageMap);
+      replay(client);
+      replay(amiClient);
+      replay(credentialsMap);
+      replay(credentialProvider);
+      replay(instance);
+      replay(jcImage);
+
+      RunningInstanceToNodeMetadata parser = new RunningInstanceToNodeMetadata(client, credentialsMap,
+               credentialProvider, imageMap, locations, hardwares);
+
+      NodeMetadata metadata = parser.apply(instance);
+
+      assertEquals(metadata.getTag(), "NOTAG-i-3d640055");
+      assertEquals(metadata.getLocation(), region);
+      assertEquals(metadata.getImageId(), "us-east-1/ami-1515f07c");
+      assertEquals(metadata.getHardware().getId(), "m1.small");
+      assertEquals(metadata.getHardware().getName(), "m1.small");
+      assertEquals(metadata.getHardware().getProviderId(), "m1.small");
+      assertEquals(metadata.getHardware().getProcessors(), ImmutableList.<Processor> of(new Processor(1.0, 1.0)));
+      assertEquals(metadata.getHardware().getRam(), 1740);
+      assertEquals(metadata.getHardware().getVolumes(), ImmutableList.<Volume> of(new VolumeImpl(null,
+               Volume.Type.LOCAL, 10.0f, "/dev/sda1", true, false),//
+               new VolumeImpl(null, Volume.Type.LOCAL, 150.0f, "/dev/sda2", false, false)));
+
+      assertEquals(metadata.getCredentials(), new Credentials("root", null));
+
+      verify(imageMap);
+      verify(jcImage);
+      verify(client);
+      verify(amiClient);
+      verify(credentialsMap);
+      verify(credentialProvider);
+      verify(instance);
+
+   }
+
    @SuppressWarnings("unchecked")
    @Test
    public void testImageNotFoundAndLazyReturnsNull() throws UnknownHostException {