diff --git a/src/app/products/loan-products/common/loan-product-summary/loan-product-summary.component.html b/src/app/products/loan-products/common/loan-product-summary/loan-product-summary.component.html
index b2a573371..acb85232a 100644
--- a/src/app/products/loan-products/common/loan-product-summary/loan-product-summary.component.html
+++ b/src/app/products/loan-products/common/loan-product-summary/loan-product-summary.component.html
@@ -780,11 +780,7 @@
 
     <mat-divider [inset]="true"></mat-divider>
 
-    <table
-      class="mat-elevation-z1 flex-fill"
-      mat-table
-      [dataSource]="loanProduct.charges | chargesPenaltyFilter: false"
-    >
+    <table class="mat-elevation-z1 flex-100" mat-table [dataSource]="loanProduct.charges | chargesPenaltyFilter: false">
       <ng-container matColumnDef="name">
         <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Name' | translate }}</th>
         <td mat-cell *matCellDef="let charge">
@@ -821,7 +817,7 @@
 
     <mat-divider [inset]="true"></mat-divider>
 
-    <table class="mat-elevation-z1 flex-fill" mat-table [dataSource]="loanProduct.charges | chargesPenaltyFilter: true">
+    <table class="mat-elevation-z1 flex-100" mat-table [dataSource]="loanProduct.charges | chargesPenaltyFilter: true">
       <ng-container matColumnDef="name">
         <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Name' | translate }}</th>
         <td mat-cell *matCellDef="let overdueCharge">
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-accounting-step/loan-product-accounting-step.component.ts b/src/app/products/loan-products/loan-product-stepper/loan-product-accounting-step/loan-product-accounting-step.component.ts
index a28d50813..5668a4ce8 100644
--- a/src/app/products/loan-products/loan-product-stepper/loan-product-accounting-step/loan-product-accounting-step.component.ts
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-accounting-step/loan-product-accounting-step.component.ts
@@ -148,7 +148,7 @@ export class LoanProductAccountingStepComponent implements OnInit, OnChanges {
         this.loanProductAccountingForm.patchValue({
           enableAccrualActivityPosting: this.loanProductsTemplate.enableAccrualActivityPosting
         });
-        if (this.capitalizedIncome.enableIncomeCapitalization) {
+        if (this.capitalizedIncome && this.capitalizedIncome.enableIncomeCapitalization) {
           this.loanProductAccountingForm.patchValue({
             deferredIncomeLiabilityAccountId: accountingMappings.deferredIncomeLiabilityAccount.id,
             incomeFromCapitalizationAccountId: accountingMappings.incomeFromCapitalizationAccount.id
@@ -165,7 +165,7 @@ export class LoanProductAccountingStepComponent implements OnInit, OnChanges {
           incomeFromPenaltyAccountId: accountingMappings.incomeFromPenaltyAccount.id,
           incomeFromRecoveryAccountId: accountingMappings.incomeFromRecoveryAccount.id,
           writeOffAccountId: accountingMappings.writeOffAccount.id,
-          goodwillCreditAccountId: accountingMappings.goodwillCreditAccount.id,
+          goodwillCreditAccountId: accountingMappings.goodwillCreditAccount?.id || null,
           overpaymentLiabilityAccountId: accountingMappings.overpaymentLiabilityAccount.id,
           chargeOffFraudExpenseAccountId: accountingMappings.chargeOffFraudExpenseAccount
             ? accountingMappings.chargeOffFraudExpenseAccount.id
@@ -591,7 +591,7 @@ export class LoanProductAccountingStepComponent implements OnInit, OnChanges {
 
   setCapitalizedIncomeControls() {
     if (this.isAccountingAccrualBased) {
-      if (this.capitalizedIncome.enableIncomeCapitalization) {
+      if (this.capitalizedIncome && this.capitalizedIncome.enableIncomeCapitalization) {
         this.loanProductAccountingForm.addControl(
           'deferredIncomeLiabilityAccountId',
           new UntypedFormControl('', Validators.required)