diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/documentmanagement/service/ImageReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/documentmanagement/service/ImageReadPlatformServiceImpl.java
index 1d260c46c..18becb349 100755
--- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/documentmanagement/service/ImageReadPlatformServiceImpl.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/documentmanagement/service/ImageReadPlatformServiceImpl.java
@@ -71,7 +71,13 @@ public class ImageReadPlatformServiceImpl implements ImageReadPlatformService {
 
             final ImageData imageData = this.jdbcTemplate.queryForObject(sql, imageMapper, new Object[] { clientId });
             final ContentRepository contentRepository = this.contentRepositoryFactory.getRepository(imageData.storageType());
-            return contentRepository.fetchImage(imageData);
+            final ImageData result = contentRepository.fetchImage(imageData);
+
+            if (result.getContent() == null) {
+                throw new ImageNotFoundException("clients", clientId);
+            }
+
+            return result;
         } catch (final EmptyResultDataAccessException e) {
             throw new ImageNotFoundException("clients", clientId);
         }