diff --git a/api-2.4/src/main/java/org/openmrs/module/initializer/api/billing/PaymentModesCsvParser.java b/api-2.4/src/main/java/org/openmrs/module/initializer/api/billing/PaymentModesCsvParser.java
index c6565b57..92ac2b5a 100644
--- a/api-2.4/src/main/java/org/openmrs/module/initializer/api/billing/PaymentModesCsvParser.java
+++ b/api-2.4/src/main/java/org/openmrs/module/initializer/api/billing/PaymentModesCsvParser.java
@@ -18,7 +18,7 @@ public class PaymentModesCsvParser extends CsvParser<PaymentMode, BaseLineProces
 	
 	@Autowired
 	public PaymentModesCsvParser(@Qualifier("cashierPaymentModeService") IPaymentModeService paymentModeService,
-			PaymentModesLineProcessor processor) {
+	    PaymentModesLineProcessor processor) {
 		super(processor);
 		this.paymentModeService = paymentModeService;
 	}
diff --git a/api-2.4/src/main/java/org/openmrs/module/initializer/api/billing/PaymentModesLineProcessor.java b/api-2.4/src/main/java/org/openmrs/module/initializer/api/billing/PaymentModesLineProcessor.java
index e7253ca6..748873ab 100644
--- a/api-2.4/src/main/java/org/openmrs/module/initializer/api/billing/PaymentModesLineProcessor.java
+++ b/api-2.4/src/main/java/org/openmrs/module/initializer/api/billing/PaymentModesLineProcessor.java
@@ -21,18 +21,21 @@ public PaymentMode fill(PaymentMode paymentMode, CsvLine line) throws IllegalArg
 		
 		String attributes = line.get(HEADER_ATTRIBUTES, false);
 		if (StringUtils.isNotBlank(attributes)) {
-			paymentMode.getAttributeTypes().clear();
+			if (paymentMode.getAttributeTypes() != null) {
+				paymentMode.getAttributeTypes().clear();
+			}
 			for (String attribute : attributes.split(BaseLineProcessor.LIST_SEPARATOR)) {
 				String[] parts = attribute.trim().split("::");
 				if (parts.length > 3) {
-					paymentMode.addAttributeType(parts[0].trim(), parts[1].trim(), parts[2].trim(), Boolean.parseBoolean(parts[3].trim()));
+					paymentMode.addAttributeType(parts[0].trim(), parts[1].trim(), parts[2].trim(),
+					    Boolean.parseBoolean(parts[3].trim()));
 				} else if (parts.length > 2) {
 					paymentMode.addAttributeType(parts[0].trim(), parts[1].trim(), parts[2].trim(), false);
 				} else if (parts.length > 1) {
 					paymentMode.addAttributeType(parts[0].trim(), parts[1].trim(), null, false);
 				} else {
 					paymentMode.addAttributeType(parts[0].trim(), null, null, false);
-				} 
+				}
 			}
 		}
 		
diff --git a/api-2.4/src/test/java/org/openmrs/module/initializer/api/PaymentModesLoaderIntegrationTest.java b/api-2.4/src/test/java/org/openmrs/module/initializer/api/PaymentModesLoaderIntegrationTest.java
index 6ce7fafa..d7695335 100644
--- a/api-2.4/src/test/java/org/openmrs/module/initializer/api/PaymentModesLoaderIntegrationTest.java
+++ b/api-2.4/src/test/java/org/openmrs/module/initializer/api/PaymentModesLoaderIntegrationTest.java
@@ -49,7 +49,16 @@ public void load_shouldLoadPaymentModesAccordingToCsvFiles() {
 		{
 			PaymentMode paymentMode = paymentModeService.getByUuid("e168c141-f5fd-4eec-bd3e-633bed1c9606");
 			assertNotNull(paymentMode);
-			assertEquals("Nutrition Cash Item", paymentMode.getName());
+			assertEquals("Paypal", paymentMode.getName());
+			
+			paymentMode.getAttributeTypes().forEach(attributeType -> {
+				if (attributeType.getName().equals("Maximum")) {
+					assertEquals("Numeric", attributeType.getFormat());
+					assertTrue(attributeType.getRequired());
+				} else {
+					assertEquals("Minimum", attributeType.getName());
+				}
+			});
 		}
 		
 		// Verify edition
diff --git a/api-2.4/src/test/resources/testAppDataDir/configuration/paymentmodes/paymentModes.csv b/api-2.4/src/test/resources/testAppDataDir/configuration/paymentmodes/paymentModes.csv
index c57ad1e7..ab05a985 100644
--- a/api-2.4/src/test/resources/testAppDataDir/configuration/paymentmodes/paymentModes.csv
+++ b/api-2.4/src/test/resources/testAppDataDir/configuration/paymentmodes/paymentModes.csv
@@ -1,4 +1,4 @@
 uuid,Void/Retire,name,attributes
 526bf278-ba81-4436-b867-c2f6641d060a,,Visa card edited,
 2b1b9aae-5d35-43dd-9214-3fd370fd7737,true,Bank transfer,
-fd0ff4ff-dec2-47f5-bb19-5c93b400e94c,,Paypal,Maximum::Numeric::::True;Minimum
+e168c141-f5fd-4eec-bd3e-633bed1c9606,,Paypal,Maximum::Numeric::::True;Minimum
diff --git a/api/src/main/java/org/openmrs/module/initializer/api/CsvParser.java b/api/src/main/java/org/openmrs/module/initializer/api/CsvParser.java
index 6066d8a7..b781126c 100644
--- a/api/src/main/java/org/openmrs/module/initializer/api/CsvParser.java
+++ b/api/src/main/java/org/openmrs/module/initializer/api/CsvParser.java
@@ -189,6 +189,8 @@ public List<String[]> getLines() {
 	 * @return The resulting CsvParserResult instance.
 	 */
 	public CsvFailingLines process(List<String[]> lines) {
+		Context.flushSession();
+		Context.clearSession();
 		
 		CsvFailingLines result = new CsvFailingLines();
 		int saved = 0;
@@ -211,9 +213,6 @@ public CsvFailingLines process(List<String[]> lines) {
 			}
 		}
 		
-		Context.flushSession();
-		Context.clearSession();
-		
 		return result;
 	}