=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/DefaultADXDataService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/DefaultADXDataService.java	2015-07-08 16:19:15 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/DefaultADXDataService.java	2015-07-10 09:04:07 +0000
@@ -289,7 +289,11 @@
         IdentifiableProperty dataElementIdScheme = importOptions.getDataElementIdScheme();
 
         DataElement dataElement = identifiableObjectManager.getObject( DataElement.class, dataElementIdScheme,dvAttributes.get( ADXConstants.DATAELEMENT));
-            
+        
+        if (dataElement == null)
+        {
+            throw new ADXException(dvAttributes.get( ADXConstants.DATAELEMENT), "No matching dataelement");
+        }
         // process adx datavalue attributes
         if ( !dvAttributes.containsKey( ADXConstants.CATOPTCOMBO ) )
         {
@@ -309,7 +313,7 @@
             }
             else
             {
-                throw new ADXException( "Dataelement " + dataElement.getShortName() + " expects text annotation" );
+                throw new ADXException( dvAttributes.get( ADXConstants.DATAELEMENT),"Dataelement expects text annotation" );
             }
         }