=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/util/PatientIdentifierGenerator.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/util/PatientIdentifierGenerator.java	2013-11-04 00:01:39 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/util/PatientIdentifierGenerator.java	2013-11-08 14:50:14 +0000
@@ -51,8 +51,14 @@
      */
     public static String getNewIdentifier( Date birthDate, String gender )
     {
+        if ( birthDate == null || gender == null )
+        {
+            return null;
+        }
+        
         String noCheck = formatDate( birthDate ) + formatGender( gender )
             + getFixLengthOfNumber( new Random().nextInt( 100000 ), 6 );
+        
         return noCheck + getCheckdigit( noCheck );
     }