diff --git a/simplified-app/src/main/java/org/nypl/simplified/app/catalog/CatalogActivity.java b/simplified-app/src/main/java/org/nypl/simplified/app/catalog/CatalogActivity.java
index d42f898c8..83e899433 100644
--- a/simplified-app/src/main/java/org/nypl/simplified/app/catalog/CatalogActivity.java
+++ b/simplified-app/src/main/java/org/nypl/simplified/app/catalog/CatalogActivity.java
@@ -62,8 +62,12 @@ private void configureUpButton(
     final Intent i = NullCheck.notNull(this.getIntent());
     final Bundle a = i.getExtras();
     if (a != null) {
-      return (ImmutableStack<CatalogUpStackEntry>) NullCheck.notNull(a
-        .getSerializable(CatalogActivity.CATALOG_UP_STACK_ID));
+      final ImmutableStack<CatalogUpStackEntry> stack =
+        (ImmutableStack<CatalogUpStackEntry>) a
+          .getSerializable(CatalogActivity.CATALOG_UP_STACK_ID);
+      if (stack != null) {
+        return stack;
+      }
     }
 
     final ImmutableStack<CatalogUpStackEntry> empty = ImmutableStack.empty();