=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java	2014-01-09 15:34:25 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java	2014-01-09 17:09:05 +0000
@@ -180,6 +180,9 @@
         return elements;
     }
     
+    /**
+     * Returns PatientIdentifierTypes from ProgramPatientIdentifierTypes.
+     */
     public List<PatientIdentifierType> getIdentifierTypes()
     {
         List<PatientIdentifierType> types = new ArrayList<PatientIdentifierType>();
@@ -192,6 +195,9 @@
         return types;
     }
     
+    /**
+     * Returns PatientAttributes from ProgramPatientAttributes.
+     */
     public List<PatientAttribute> getAttributes()
     {
         List<PatientAttribute> attributes = new ArrayList<PatientAttribute>();

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattribute/SavePatientAttributeInListNoProgramAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattribute/SavePatientAttributeInListNoProgramAction.java	2014-01-08 16:13:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattribute/SavePatientAttributeInListNoProgramAction.java	2014-01-09 17:09:05 +0000
@@ -39,9 +39,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ SavePatientAttributeInListNoProgramAction.java Jan 8, 2014 8:52:31
- *          PM $
  */
 public class SavePatientAttributeInListNoProgramAction
     implements Action
@@ -91,7 +88,6 @@
         for ( String objectId : selectedAttributeIds )
         {
             // Identifier type
-
             String[] id = objectId.split( "_" );
             if ( id[0].equals( PREFIX_IDENTYFITER_TYPE ) )
             {
@@ -106,7 +102,7 @@
             }
 
             // Attribute
-            else
+            else if ( id[0].equals( PREFIX_ATTRIBUTE ) )
             {
                 PatientAttribute patientAttribute = patientAttributeService.getPatientAttribute( Integer
                     .parseInt( id[1] ) );