=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttribute.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttribute.java	2014-01-02 13:13:21 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttribute.java	2014-01-03 09:32:11 +0000
@@ -86,7 +86,7 @@
 
     private PatientAttributeGroup patientAttributeGroup;
 
-    private Set<PatientAttributeOption> attributeOptions;
+    private Set<PatientAttributeOption> attributeOptions = new HashSet<PatientAttributeOption>();
 
     private String expression;
 

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientMobileSetting.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientMobileSetting.java	2013-12-17 00:13:51 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientMobileSetting.java	2014-01-03 09:32:11 +0000
@@ -28,6 +28,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class PatientMobileSetting
@@ -40,7 +41,7 @@
 
     private Double versionToUpdate;
 
-    private List<PatientAttribute> patientAttributes;
+    private List<PatientAttribute> patientAttributes = new ArrayList<PatientAttribute>();
 
     public PatientMobileSetting()
     {

=== 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-02 11:35:24 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java	2014-01-03 09:32:11 +0000
@@ -28,6 +28,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
@@ -108,9 +109,9 @@
 
     private Boolean ignoreOverdueEvents = false;
 
-    private List<PatientIdentifierType> patientIdentifierTypes;
+    private List<PatientIdentifierType> patientIdentifierTypes = new ArrayList<PatientIdentifierType>();
 
-    private List<PatientAttribute> patientAttributes;
+    private List<PatientAttribute> patientAttributes = new ArrayList<PatientAttribute>();
 
     private Set<UserAuthorityGroup> userRoles = new HashSet<UserAuthorityGroup>();
 

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstance.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstance.java	2014-01-02 13:45:23 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstance.java	2014-01-03 09:32:11 +0000
@@ -28,6 +28,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
@@ -83,9 +84,9 @@
     
     private Set<ProgramStageInstance> programStageInstances = new HashSet<ProgramStageInstance>();
 
-    private List<OutboundSms> outboundSms;
+    private List<OutboundSms> outboundSms = new ArrayList<OutboundSms>();
 
-    private List<MessageConversation> messageConversations;
+    private List<MessageConversation> messageConversations = new ArrayList<MessageConversation>();
 
     private Boolean followup = false;
 

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageInstance.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageInstance.java	2013-12-16 08:29:52 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageInstance.java	2014-01-03 09:32:11 +0000
@@ -33,6 +33,7 @@
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.sms.outbound.OutboundSms;
 
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -76,9 +77,9 @@
 
     private boolean completed;
 
-    private List<OutboundSms> outboundSms;
+    private List<OutboundSms> outboundSms = new ArrayList<OutboundSms>();
 
-    private List<MessageConversation> messageConversations;
+    private List<MessageConversation> messageConversations = new ArrayList<MessageConversation>();
 
     private Integer status = ACTIVE_STATUS;