=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/expression/DefaultExpressionService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/expression/DefaultExpressionService.java	2013-11-06 00:03:02 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/expression/DefaultExpressionService.java	2013-12-01 16:19:14 +0000
@@ -39,6 +39,7 @@
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Matcher;
@@ -547,7 +548,11 @@
             {
                 final StringBuilder replace = new StringBuilder( PAR_OPEN );
 
-                for ( String coc : dataElementOptionComboMap.get( matcher.group( 1 ) ) )
+                String de = matcher.group( 1 );
+                
+                List<String> cocs = dataElementOptionComboMap.get( de );
+                
+                for ( String coc : cocs )
                 {
                     replace.append( EXP_OPEN ).append( matcher.group( 1 ) ).append( SEPARATOR ).append(
                         coc ).append( EXP_CLOSE ).append( "+" );