/*
 * Copyright (c) 2017, University of Oslo
 *
 * All rights reserved.
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
 * Redistributions of source code must retain the above copyright notice, this
 * list of conditions and the following disclaimer.
 *
 * Redistributions in binary form must reproduce the above copyright notice,
 * this list of conditions and the following disclaimer in the documentation
 * and/or other materials provided with the distribution.
 * Neither the name of the HISP project nor the names of its contributors may
 * be used to endorse or promote products derived from this software without
 * specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
package org.hisp.dhis.android.core.program;

import org.hisp.dhis.android.core.arch.handlers.IdentifiableSyncHandlerImpl;
import org.hisp.dhis.android.core.common.HandleAction;
import org.hisp.dhis.android.core.common.IdentifiableObjectStore;
import org.hisp.dhis.android.core.data.database.DatabaseAdapter;
import org.hisp.dhis.android.core.dataelement.DataElementHandler;

public final class ProgramStageDataElementHandler extends IdentifiableSyncHandlerImpl<ProgramStageDataElement> {

    private final DataElementHandler dataElementHandler;

    private ProgramStageDataElementHandler(IdentifiableObjectStore<ProgramStageDataElement> ProgramStageDataElementStore,
                                           DataElementHandler dataElementHandler) {
        super(ProgramStageDataElementStore);
        this.dataElementHandler = dataElementHandler;
    }

    public static ProgramStageDataElementHandler create(DatabaseAdapter databaseAdapter) {
        return new ProgramStageDataElementHandler(ProgramStageDataElementStore.create(databaseAdapter),
                DataElementHandler.create(databaseAdapter));
    }

    @Override
    protected void afterObjectHandled(ProgramStageDataElement programStageDataElement, HandleAction action) {
        dataElementHandler.handle(programStageDataElement.dataElement());
    }
}
@@ -1927,22 +1927,16 @@
 %0Apublic 
-final 
 class Pr
@@ -2090,24 +2090,16 @@
 r;%0A%0A    
-private 
 ProgramS
@@ -2121,16 +2121,29 @@
 Handler(
+%0A            
 Identifi
@@ -2183,17 +2183,17 @@
 lement%3E 
-P
+p
 rogramSt
@@ -2293,24 +2293,25 @@
 tHandler) %7B%0A
+%0A
         supe
@@ -2312,17 +2312,17 @@
   super(
-P
+p
 rogramSt
@@ -2787,24 +2787,90 @@
 n action) %7B%0A
+%0A        if (programStageDataElement.dataElement() != null) %7B%0A    
         data
@@ -2927,19 +2927,29 @@
 Element());%0A
+        %7D%0A
     %7D%0A%7D

Add null check for ProgramStageDataElementHandler