From 60f091d0d602ee81c98c0fcaae2f311702d8d510 Mon Sep 17 00:00:00 2001
From: TuringTechnologies <turingtechnologies@gmail.com>
Date: Sun, 7 Aug 2016 16:40:43 -0400
Subject: [PATCH] Version 10.1.3

- Fixes #61

- Fixes #51
---
 lib/build.gradle                                         | 2 +-
 .../materialscrollbar/ScrollingUtilities.java            | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index b5150d8..9908cc0 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
-def version = '10.1.1'
+def version = '10.1.3'
 
 install {
     repositories.mavenInstaller {
diff --git a/lib/src/main/java/com/turingtechnologies/materialscrollbar/ScrollingUtilities.java b/lib/src/main/java/com/turingtechnologies/materialscrollbar/ScrollingUtilities.java
index 5cf2cc9..073e5bb 100644
--- a/lib/src/main/java/com/turingtechnologies/materialscrollbar/ScrollingUtilities.java
+++ b/lib/src/main/java/com/turingtechnologies/materialscrollbar/ScrollingUtilities.java
@@ -149,8 +149,13 @@ public void getCurScrollState() {
         if (materialScrollBar.recyclerView.getLayoutManager() instanceof GridLayoutManager) {
             scrollPosState.rowIndex = scrollPosState.rowIndex / ((GridLayoutManager) materialScrollBar.recyclerView.getLayoutManager()).getSpanCount();
         }
-        scrollPosState.rowTopOffset = materialScrollBar.recyclerView.getLayoutManager().getDecoratedTop(child);
-        scrollPosState.rowHeight = child.getHeight();
+        if(child == null){
+            scrollPosState.rowTopOffset = 0;
+            scrollPosState.rowHeight = 0;
+        } else {
+            scrollPosState.rowTopOffset = materialScrollBar.recyclerView.getLayoutManager().getDecoratedTop(child);
+            scrollPosState.rowHeight = child.getHeight();
+        }
     }
 
 }