diff --git a/car-ui-lib/src/com/android/car/ui/pagedrecyclerview/PagedRecyclerView.java b/car-ui-lib/src/com/android/car/ui/pagedrecyclerview/PagedRecyclerView.java
index c8f2d3c..52bc541 100644
--- a/car-ui-lib/src/com/android/car/ui/pagedrecyclerview/PagedRecyclerView.java
+++ b/car-ui-lib/src/com/android/car/ui/pagedrecyclerview/PagedRecyclerView.java
@@ -294,7 +294,7 @@
                 a.getInt(R.styleable.PagedRecyclerView_layoutStyle, PagedRecyclerViewLayout.LINEAR);
         mNumOfColumns = a.getInt(R.styleable.PagedRecyclerView_numOfColumns, /* defValue= */ 2);
         boolean enableDivider =
-                a.getBoolean(R.styleable.PagedRecyclerView_enableDivider, /* defValue= */ true);
+                a.getBoolean(R.styleable.PagedRecyclerView_enableDivider, /* defValue= */ false);
 
         if (mPagedRecyclerViewLayout == PagedRecyclerViewLayout.LINEAR) {
 
@@ -427,8 +427,12 @@
     /** Sets the number of columns in which grid needs to be divided. */
     public void setNumOfColumns(int numberOfColumns) {
         mNumOfColumns = numberOfColumns;
-        mOffsetItemDecoration.setNumOfColumns(mNumOfColumns);
-        mDividerItemDecoration.setNumOfColumns(mNumOfColumns);
+        if (mOffsetItemDecoration != null) {
+            mOffsetItemDecoration.setNumOfColumns(mNumOfColumns);
+        }
+        if (mDividerItemDecoration != null) {
+            mDividerItemDecoration.setNumOfColumns(mNumOfColumns);
+        }
     }
 
     /**
diff --git a/car-ui-lib/src/com/android/car/ui/pagedrecyclerview/PagedSnapHelper.java b/car-ui-lib/src/com/android/car/ui/pagedrecyclerview/PagedSnapHelper.java
index b3c0bbc..64043f1 100644
--- a/car-ui-lib/src/com/android/car/ui/pagedrecyclerview/PagedSnapHelper.java
+++ b/car-ui-lib/src/com/android/car/ui/pagedrecyclerview/PagedSnapHelper.java
@@ -76,6 +76,7 @@
         int position = findTargetSnapPosition(mRecyclerView.getLayoutManager(), scrollDistance);
         if (position == RecyclerView.NO_POSITION) {
             mRecyclerView.smoothScrollBy(0, scrollDistance);
+            return;
         }
         mSmoothScroller.setTargetPosition(position);
         mRecyclerView.getLayoutManager().startSmoothScroll(mSmoothScroller);