diff --git a/src/com/dougkeen/bart/activities/ViewDeparturesActivity.java b/src/com/dougkeen/bart/activities/ViewDeparturesActivity.java
index 6299364..105c22f 100644
--- a/src/com/dougkeen/bart/activities/ViewDeparturesActivity.java
+++ b/src/com/dougkeen/bart/activities/ViewDeparturesActivity.java
@@ -591,6 +591,13 @@ public class ViewDeparturesActivity extends SActivity implements
 			final BartRunnerApplication application = (BartRunnerApplication) getApplication();
 			final Departure boardedDeparture = application
 					.getBoardedDeparture();
+
+			if (boardedDeparture == null) {
+				mode.finish();
+				refreshBoardedDeparture();
+				return true;
+			}
+
 			if (boardedDeparture.isAlarmPending()) {
 				cancelAlarmButton.setVisible(true);
 				setAlarmButton.setIcon(R.drawable.ic_action_alarm);
diff --git a/src/com/dougkeen/bart/controls/SwipeDismissTouchListener.java b/src/com/dougkeen/bart/controls/SwipeDismissTouchListener.java
index 98e3eda..c82d113 100644
--- a/src/com/dougkeen/bart/controls/SwipeDismissTouchListener.java
+++ b/src/com/dougkeen/bart/controls/SwipeDismissTouchListener.java
@@ -59,11 +59,6 @@ import static com.nineoldandroids.view.ViewPropertyAnimator.animate;
  * 		}));
  * </pre>
  * 
- * <p>
- * This class Requires API level 12 or later due to use of
- * {@link android.view.ViewPropertyAnimator}.
- * </p>
- * 
  * @see SwipeDismissListViewTouchListener
  */
 public class SwipeDismissTouchListener implements View.OnTouchListener {