From b7ba92417464d4579f3cdbf2b9d91a814ef7ff38 Mon Sep 17 00:00:00 2001
From: Nazeer Hussain Shaik <nazeer.shaik@confluxtechnologies.com>
Date: Tue, 21 Jun 2016 13:15:08 +0530
Subject: [PATCH] FINERACT-181

---
 .../shareaccounts/serialization/ShareAccountDataSerializer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/serialization/ShareAccountDataSerializer.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/serialization/ShareAccountDataSerializer.java
index 78b9b3506..11daee94a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/serialization/ShareAccountDataSerializer.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/serialization/ShareAccountDataSerializer.java
@@ -647,7 +647,7 @@ public class ShareAccountDataSerializer {
         ShareProduct shareProduct = account.getShareProduct();
         if (sharesRequested != null) {
             Long totalSharesAfterapproval = account.getTotalApprovedShares() + sharesRequested;
-            if(totalSharesAfterapproval > shareProduct.getMaximumClientShares()) {
+            if(shareProduct.getMaximumClientShares() != null && totalSharesAfterapproval > shareProduct.getMaximumClientShares()) {
                 baseDataValidator.reset().parameter(ShareAccountApiConstants.requestedshares_paramname).value(sharesRequested)
                 .failWithCode("exceeding.maximum.limit.defined.in.the.shareproduct", "Existing and requested shares count is more than product definition");
             }