diff --git a/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/MainActivity.java b/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/MainActivity.java
index 63e5effd..46ceb395 100644
--- a/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/MainActivity.java
+++ b/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/MainActivity.java
@@ -408,7 +408,7 @@ public void restoreActionBar() {
     }
 
     @Override
-    public boolean onNavigationItemSelected(MenuItem menuItem) {
+    public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
         if (menuItem == null) {
             return false;
         }
@@ -442,20 +442,11 @@ public boolean onNavigationItemSelected(MenuItem menuItem) {
         } else if (itemId == R.id.navigation_item_onboarding) {
             startActivity(new Intent(this, OnboardingActivity.class));
         } else if (itemId == R.id.navigation_item_activities) {
-            try {
-                startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.navigation_activities_link))));
-            } catch (ActivityNotFoundException ignored) {
-            }
+            safeStartActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.navigation_activities_link))));
         } else if (itemId == R.id.navigation_item_get_science_kit) {
-            try {
-                startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.navigation_get_science_kit_link))));
-            } catch (ActivityNotFoundException ignored) {
-            }
+            safeStartActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.navigation_get_science_kit_link))));
         } else if (itemId == R.id.navigation_item_get_help) {
-            try {
-                startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.navigation_get_help_link))));
-            } catch (ActivityNotFoundException ignored) {
-            }
+            safeStartActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.navigation_get_help_link))));
         } else if (itemId == R.id.navigation_item_settings) {
             startActivity(new Intent(this, ArduinoSettingsActivity.class));
         } else {
@@ -501,6 +492,14 @@ public boolean onNavigationItemSelected(MenuItem menuItem) {
         return false;
     }
 
+    private void safeStartActivity(@NonNull Intent intent) {
+        try {
+            startActivity(intent);
+        } catch (ActivityNotFoundException exception) {
+            Log.e(TAG, "", exception);
+        }
+    }
+
     private CharSequence getTitleToRestore(MenuItem menuItem) {
         if (menuItem.getItemId() == R.id.navigation_item_experiments) {
             return getResources().getString(R.string.app_name);
diff --git a/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/actionarea/ActionFragment.java b/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/actionarea/ActionFragment.java
index 65cdb33e..3e8d55dd 100644
--- a/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/actionarea/ActionFragment.java
+++ b/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/actionarea/ActionFragment.java
@@ -17,7 +17,7 @@
 package com.google.android.apps.forscience.whistlepunk.actionarea;
 
 import android.os.Bundle;
-import android.transition.Slide;
+import androidx.transition.Slide;
 import android.view.Gravity;
 import android.view.Menu;
 import android.view.View;