=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java 2015-02-24 11:37:53 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java 2015-03-17 11:18:29 +0000 @@ -492,8 +492,12 @@ if ( PeriodType.class.isAssignableFrom( field.getType() ) ) { PeriodType periodType = ReflectionUtils.invokeGetterMethod( field.getName(), object ); - periodType = objectBridge.getObject( periodType ); - ReflectionUtils.invokeSetterMethod( field.getName(), object, periodType ); + + if ( periodType != null ) + { + periodType = objectBridge.getObject( periodType ); + ReflectionUtils.invokeSetterMethod( field.getName(), object, periodType ); + } } } }