diff --git a/src/main/java/cokr/xit/fims/cmmn/CodeConverter.java b/src/main/java/cokr/xit/fims/cmmn/CodeConverter.java
index c8421f13..a7fd3e73 100644
--- a/src/main/java/cokr/xit/fims/cmmn/CodeConverter.java
+++ b/src/main/java/cokr/xit/fims/cmmn/CodeConverter.java
@@ -51,7 +51,7 @@ public class CodeConverter {
 
 		List<CommonCode> commonCodeList = commonCodes.get(codeGroupName);
 
-		for(int i = 0; i < commonCodeList.size(); i++) {
+		for(int i = 0, size = commonCodeList != null ? commonCodeList.size() : 0; i < size; i++) {
 			if(code.equals(commonCodeList.get(i).getCode())) {
 				result = commonCodeList.get(i).getValue();
 			}