diff --git a/chartLib/src/main/kotlin/info/appdev/charting/data/CombinedData.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/CombinedData.kt
index e4b7fac73..728228526 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/data/CombinedData.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/data/CombinedData.kt
@@ -113,7 +113,7 @@ class CombinedData : BarLineScatterCandleBubbleData<IBarLineScatterCandleBubbleD
         }
 
     fun getDataByIndex(index: Int): BarLineScatterCandleBubbleData<*> {
-        return this.allData.get(index)
+        return this.allData[index]
     }
 
     override fun notifyDataChanged() {
@@ -131,7 +131,7 @@ class CombinedData : BarLineScatterCandleBubbleData<IBarLineScatterCandleBubbleD
      * @return the entry that is highlighted
      */
     override fun getEntryForHighlight(highlight: Highlight): Entry? {
-        if (highlight.dataIndex >= this.allData.size)
+        if (highlight.dataIndex >= this.allData.size || highlight.dataIndex < 0)
             return null
 
         val data: ChartData<*> = getDataByIndex(highlight.dataIndex)