=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientidentifiertype/AddPatientIdentifierTypeAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientidentifiertype/AddPatientIdentifierTypeAction.java	2013-10-16 09:32:44 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientidentifiertype/AddPatientIdentifierTypeAction.java	2013-10-16 09:33:26 +0000
@@ -170,11 +170,7 @@
             {
                 PeriodType periodType = periodService.getPeriodTypeByName( periodTypeName );
                 periodType = periodService.reloadPeriodType( periodType );
-
-                if ( periodType != null )
-                {
-                    identifierType.setPeriodType( periodType );
-                }
+                identifierType.setPeriodType( periodType );
             }
             else
             {

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientidentifiertype/UpdatePatientIdentifierTypeAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientidentifiertype/UpdatePatientIdentifierTypeAction.java	2013-10-16 09:32:44 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientidentifiertype/UpdatePatientIdentifierTypeAction.java	2013-10-16 09:33:26 +0000
@@ -174,11 +174,7 @@
                 {
                     PeriodType periodType = periodService.getPeriodTypeByName( periodTypeName );
                     periodType = periodService.reloadPeriodType( periodType );
-
-                    if ( periodType != null )
-                    {
-                        identifierType.setPeriodType( periodType );
-                    }
+                    identifierType.setPeriodType( periodType );
                 }
                 else
                 {