1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/dreams/phototable/PhotoTable.java b/src/com/android/dreams/phototable/PhotoTable.java
index 1ba95b9..5cdd70f 100644
--- a/src/com/android/dreams/phototable/PhotoTable.java
+++ b/src/com/android/dreams/phototable/PhotoTable.java
@@ -286,7 +286,9 @@ public class PhotoTable extends FrameLayout {
     }
 
     public void setDefaultFocus() {
-        setFocus(mOnTable.getLast());
+        if (mOnTable.size() > 0) {
+            setFocus(mOnTable.getLast());
+        }
     }
 
     public void setFocus(View focus) {
@@ -356,7 +358,9 @@ public class PhotoTable extends FrameLayout {
 
     public View moveFocus(View focus, float direction, float angle) {
         if (focus == null) {
-            setFocus(mOnTable.getLast());
+            if (mOnTable.size() > 0) {
+                setFocus(mOnTable.getLast());
+            }
         } else {
             final double alpha = Math.toRadians(direction);
             final double beta = Math.toRadians(Math.min(angle, 180f) / 2f);