diff --git a/android/src/main/java/cn/mandata/react_native_mpchart/MPBarLineChartManager.java b/android/src/main/java/cn/mandata/react_native_mpchart/MPBarLineChartManager.java
index 75989cc..b06e851 100644
--- a/android/src/main/java/cn/mandata/react_native_mpchart/MPBarLineChartManager.java
+++ b/android/src/main/java/cn/mandata/react_native_mpchart/MPBarLineChartManager.java
@@ -216,6 +216,7 @@ private  void setXAxisInfo(XAxis axis,ReadableMap v){
         if(v.hasKey("labelRotationAngle")) axis.setLabelRotationAngle((float) v.getDouble("labelRotationAngle"));
         if(v.hasKey("spaceBetweenLabels")) axis.setSpaceBetweenLabels(v.getInt("spaceBetweenLabels"));
         if(v.hasKey("labelsToSkip")) axis.setLabelsToSkip(v.getInt("labelsToSkip"));
+        if(v.hasKey("avoidFirstLastClipping")) axis.setAvoidFirstLastClipping(v.getBoolean("avoidFirstLastClipping"));
         if(v.hasKey("position")) {
             String name=v.getString("position");
             axis.setPosition(XAxis.XAxisPosition.valueOf(name));
diff --git a/android/src/main/java/cn/mandata/react_native_mpchart/MPLineChartManager.java b/android/src/main/java/cn/mandata/react_native_mpchart/MPLineChartManager.java
index 4e4b2ae..ed54b54 100644
--- a/android/src/main/java/cn/mandata/react_native_mpchart/MPLineChartManager.java
+++ b/android/src/main/java/cn/mandata/react_native_mpchart/MPLineChartManager.java
@@ -68,9 +68,11 @@ public void setData(LineChart chart,ReadableMap rm){
             float[] vals=new float[data.size()];
             ArrayList<Entry> entries=new ArrayList<Entry>();
             for (int j=0;j<data.size();j++){
-                vals[j]=(float)data.getDouble(j);
-                Entry be=new Entry((float)data.getDouble(j),j);
-                entries.add(be);
+                if (!data.isNull(j)) {
+                    vals[j]=(float)data.getDouble(j);
+                    Entry be=new Entry((float)data.getDouble(j),j);
+                    entries.add(be);
+                }
             }
             /*BarEntry be=new BarEntry(vals,i);
             entries.add(be);*/
diff --git a/android/src/main/java/cn/mandata/react_native_mpchart/MPPieChartManager.java b/android/src/main/java/cn/mandata/react_native_mpchart/MPPieChartManager.java
index fa10679..d4a757d 100644
--- a/android/src/main/java/cn/mandata/react_native_mpchart/MPPieChartManager.java
+++ b/android/src/main/java/cn/mandata/react_native_mpchart/MPPieChartManager.java
@@ -38,11 +38,11 @@ public void setHoleRadius(PieChart chart, float holeRadius){
     }
 
     @ReactProp(name="backgroundColor", defaultInt = Color.WHITE)
-    public void setBackgroundColor(){
+    public void setBackgroundColor(PieChart chart, int backgroundColor){
         chart.setBackgroundColor(backgroundColor);
-        chart.invalidate();    
+        chart.invalidate();
     }
-    
+
     @ReactProp(name="drawSliceText", defaultBoolean = false)
     public void setDrawSliceText(PieChart chart, boolean enabled){
         chart.setDrawSliceText(enabled);