=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java	2015-03-27 15:45:41 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java	2015-03-27 23:28:52 +0000
@@ -324,24 +324,26 @@
     // -------------------------------------------------------------------------
 
     private void upgradeProgramStageDataElements()
-    {        
-        String autoIncr = statementBuilder.getAutoIncrementValue();
-        
-        String insertSql = 
-            "insert into programstagedataelement(programstagedataelementid,programstageid,dataelementid,compulsory,allowprovidedelsewhere,sort_order,displayinreports,allowfuturedate) " +
-            "select " + autoIncr + ",programstageid,dataelementid,compulsory,allowprovidedelsewhere,sort_order,displayinreports,allowfuturedate " +
-            "from programstage_dataelements";
-        
-        int r = executeSql( insertSql );
+    {
+        int r = executeSql( "select 1 from programstage_dataelements" );
         
         if ( r != -1 )
         {
+            String autoIncr = statementBuilder.getAutoIncrementValue();
+            
+            String insertSql = 
+                "insert into programstagedataelement(programstagedataelementid,programstageid,dataelementid,compulsory,allowprovidedelsewhere,sort_order,displayinreports,allowfuturedate) " +
+                "select " + autoIncr + ",programstageid,dataelementid,compulsory,allowprovidedelsewhere,sort_order,displayinreports,allowfuturedate " +
+                "from programstage_dataelements";
+            
+            executeSql( insertSql );
+            
             String dropSql = "drop table programstage_dataelements";
             
             executeSql( dropSql );
             
             log.info( "Upgraded program stage data elements" );
-        }            
+        }
     }
     
     private void updateAggregateQueryBuilder()