diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.java b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.java
index 4de986e710..8ea56d6cfd 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.java
@@ -751,7 +751,7 @@ protected void drawMarkers(Canvas canvas) {
 			Entry e = mData.getEntryForHighlight(highlight);
 
 			// make sure entry not null before using it
-			if (e == null) {
+			if (e == null || set == null) {
 				continue;
 			}
 
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/CombinedChart.java b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/CombinedChart.java
index 8d08f59456..ab4504abaf 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/CombinedChart.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/CombinedChart.java
@@ -240,7 +240,7 @@ protected void drawMarkers(Canvas canvas) {
 			IDataSet set = mData.getDataSetByHighlight(highlight);
 
 			Entry e = mData.getEntryForHighlight(highlight);
-			if (e == null) {
+			if (e == null || set == null) {
 				continue;
 			}