diff --git a/src/main/java/org/dasein/cloud/azure/compute/image/AzureOSImage.java b/src/main/java/org/dasein/cloud/azure/compute/image/AzureOSImage.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/dasein/cloud/azure/compute/image/AzureOSImage.java
+++ b/src/main/java/org/dasein/cloud/azure/compute/image/AzureOSImage.java
@@ -355,7 +355,7 @@ public class AzureOSImage extends AbstractImageSupport {
     @Nonnull
     @Override
     public Iterable<MachineImage> listImages(@Nullable ImageFilterOptions imageFilterOptions) throws CloudException, InternalException {
-        if (!imageFilterOptions.getImageClass().equals(ImageClass.MACHINE)) {
+        if (imageFilterOptions.getImageClass() != null && !imageFilterOptions.getImageClass().equals(ImageClass.MACHINE)) {
             return Collections.emptyList();
         }
Avoid an NPE when image class not set in filter options