diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsAccountAssembler.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsAccountAssembler.java
index dc3b04fb6..59bb61336 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsAccountAssembler.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsAccountAssembler.java
@@ -216,7 +216,7 @@ public class SavingsAccountAssembler {
             allowOverdraft = product.isAllowOverdraft();
         }
 
-        BigDecimal overdraftLimit = null;
+        BigDecimal overdraftLimit = BigDecimal.ZERO;
         if (command.parameterExists(overdraftLimitParamName)) {
             overdraftLimit = command.bigDecimalValueOfParameterNamedDefaultToNullIfZero(overdraftLimitParamName);
         } else {
@@ -230,7 +230,7 @@ public class SavingsAccountAssembler {
             enforceMinRequiredBalance = product.isMinRequiredBalanceEnforced();
         }
 
-        BigDecimal minRequiredBalance = null;
+        BigDecimal minRequiredBalance = BigDecimal.ZERO;
         if (command.parameterExists(minRequiredBalanceParamName)) {
             minRequiredBalance = command.bigDecimalValueOfParameterNamedDefaultToNullIfZero(minRequiredBalanceParamName);
         } else {
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsProductAssembler.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsProductAssembler.java
index b7cae8b8f..564094800 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsProductAssembler.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsProductAssembler.java
@@ -123,14 +123,20 @@ public class SavingsProductAssembler {
             allowOverdraft = command.booleanPrimitiveValueOfParameterNamed(allowOverdraftParamName);
         }
 
-        final BigDecimal overdraftLimit = command.bigDecimalValueOfParameterNamedDefaultToNullIfZero(overdraftLimitParamName);
+        BigDecimal overdraftLimit = BigDecimal.ZERO;
+        if(command.parameterExists(overdraftLimitParamName)){
+            overdraftLimit = command.bigDecimalValueOfParameterNamed(overdraftLimitParamName);
+        }
 
         boolean enforceMinRequiredBalance = false;
         if (command.parameterExists(enforceMinRequiredBalanceParamName)) {
             enforceMinRequiredBalance = command.booleanPrimitiveValueOfParameterNamed(enforceMinRequiredBalanceParamName);
         }
 
-        final BigDecimal minRequiredBalance = command.bigDecimalValueOfParameterNamedDefaultToNullIfZero(minRequiredBalanceParamName);
+        BigDecimal minRequiredBalance = BigDecimal.ZERO;
+        if(command.parameterExists(minRequiredBalanceParamName)){
+            minRequiredBalance = command.bigDecimalValueOfParameterNamed(minRequiredBalanceParamName);
+        }
         final BigDecimal minBalanceForInterestCalculation = command
                 .bigDecimalValueOfParameterNamedDefaultToNullIfZero(minBalanceForInterestCalculationParamName);