diff --git a/OneSignalSDK/app/src/main/java/com/onesignal/example/MainActivity.java b/OneSignalSDK/app/src/main/java/com/onesignal/example/MainActivity.java
index 9319ce6e37..643e86184d 100644
--- a/OneSignalSDK/app/src/main/java/com/onesignal/example/MainActivity.java
+++ b/OneSignalSDK/app/src/main/java/com/onesignal/example/MainActivity.java
@@ -103,7 +103,8 @@ public void onUnsubscribeClicked(View v) {
    @Override
    protected void onPause() {
       super.onPause();
-      mHelper.dispose();
+      if (mHelper != null)
+         mHelper.dispose();
    }
 
    @Override
@@ -135,7 +136,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
    }
 
    // NotificationOpenedHandler is implemented in its own class instead of adding implements to MainActivity so we don't hold on to a reference of our first activity if it gets recreated.
-   @OneSignal.TiedToCurrentActivity
    private class ExampleNotificationOpenedHandler implements NotificationOpenedHandler {
       /**
        * Callback to implement in your app to handle when a notification is opened from the Android status bar or
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/GenerateNotification.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/GenerateNotification.java
index bea3ba4d96..a7e1371e27 100644
--- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/GenerateNotification.java
+++ b/OneSignalSDK/onesignal/src/main/java/com/onesignal/GenerateNotification.java
@@ -660,9 +660,10 @@ private static int getDrawableId(String name) {
 
    private static Uri getCustomSound(JSONObject gcmBundle) {
       int soundId;
-      String sound;
+      String sound = null;
       try {
-         sound = gcmBundle.getString("sound");
+         if (gcmBundle.has("sound"))
+            sound = gcmBundle.getString("sound");
       } catch (Throwable t) {
          return null;
       }
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSUtils.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSUtils.java
index b4736d2a93..7687871501 100644
--- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSUtils.java
+++ b/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSUtils.java
@@ -35,6 +35,8 @@
 class OSUtils {
    int getDeviceType() {
       try {
+         // Class only available on the FireOS and only when the following is in the AndroidManifest.xml.
+         // <amazon:enable-feature android:name="com.amazon.device.messaging" android:required="false"/>
          Class.forName("com.amazon.device.messaging.ADM");
          return 2;
       } catch (ClassNotFoundException e) {
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignal.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignal.java
index de8eb3e32c..10014a28ff 100644
--- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignal.java
+++ b/OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignal.java
@@ -154,7 +154,7 @@ public void init() {
    private static TrackGooglePurchase trackGooglePurchase;
    private static TrackAmazonPurchase trackAmazonPurchase;
 
-   public static final String VERSION = "020007";
+   public static final String VERSION = "020008";
 
    private static AdvertisingIdentifierProvider mainAdIdProvider = new AdvertisingIdProviderGPS();