diff --git a/app/src/main/java/com/balsikandar/crashreporter/sample/CrashReporterSampleApplication.java b/app/src/main/java/com/balsikandar/crashreporter/sample/CrashReporterSampleApplication.java
index 485dbad..f50d089 100644
--- a/app/src/main/java/com/balsikandar/crashreporter/sample/CrashReporterSampleApplication.java
+++ b/app/src/main/java/com/balsikandar/crashreporter/sample/CrashReporterSampleApplication.java
@@ -20,6 +20,9 @@ public void onCreate() {
         if (BuildConfig.DEBUG) {
             //initialise reporter with external path
             CrashReporter.initialize(this);
+
+            // test disable notification (call CrashReporterActivity)
+            CrashReporter.disableNotification();
         }
     }
 }
diff --git a/app/src/main/java/com/balsikandar/crashreporter/sample/MainActivity.java b/app/src/main/java/com/balsikandar/crashreporter/sample/MainActivity.java
index 41a2ab3..8591a2a 100644
--- a/app/src/main/java/com/balsikandar/crashreporter/sample/MainActivity.java
+++ b/app/src/main/java/com/balsikandar/crashreporter/sample/MainActivity.java
@@ -57,9 +57,9 @@ public void onClick(View v) {
 
 
         //Crashes and exceptions are also captured from other threads
-        new Thread(new Runnable() {
+        findViewById(R.id.catchException).setOnClickListener(new View.OnClickListener() {
             @Override
-            public void run() {
+            public void onClick(View v) {
                 try {
                     context = null;
                     context.getResources();
@@ -67,9 +67,21 @@ public void run() {
                     //log caught Exception
                     CrashReporter.logException(e);
                 }
-
             }
-        }).start();
+        });
+//        new Thread(new Runnable() {
+//            @Override
+//            public void run() {
+//                try {
+//                    context = null;
+//                    context.getResources();
+//                } catch (Exception e) {
+//                    //log caught Exception
+//                    CrashReporter.logException(e);
+//                }
+//
+//            }
+//        }).start();
 
         mContext = this;
         findViewById(R.id.crashLogActivity).setOnClickListener(new View.OnClickListener() {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9619896..7eee3b4 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -46,6 +46,14 @@
             android:textColor="@color/black"
             android:textSize="14sp" />
 
+        <Button
+            android:id="@+id/catchException"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/catch_exception"
+            android:textColor="@color/black"
+            android:textSize="14sp" />
+
         <Button
             android:id="@+id/crashLogActivity"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2d33664..43b077c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,5 +4,6 @@
     <string name="index_out_of_bound_exception">IndexOutOfBound</string>
     <string name="class_cast_exception">ClassCast Exeption</string>
     <string name="array_store_exception">ArrayStoreException</string>
+    <string name="catch_exception">Exception</string>
     <string name="add_your_crash">Add your own crash and check if it gets logged</string>
 </resources>
diff --git a/crashreporter/src/main/AndroidManifest.xml b/crashreporter/src/main/AndroidManifest.xml
index a90930a..a12daab 100644
--- a/crashreporter/src/main/AndroidManifest.xml
+++ b/crashreporter/src/main/AndroidManifest.xml
@@ -10,7 +10,12 @@
             android:name=".CrashReporterInitProvider"
             android:authorities="${applicationId}.CrashReporterInitProvider"
             android:enabled="true"
-            android:exported="false" />
+            android:grantUriPermissions="true"
+            android:exported="false" >
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths"/>
+        </provider>
 
         <activity
             android:name=".ui.CrashReporterActivity"
diff --git a/crashreporter/src/main/java/com/balsikandar/crashreporter/CrashReporterInitProvider.java b/crashreporter/src/main/java/com/balsikandar/crashreporter/CrashReporterInitProvider.java
index 5bbb2a5..e80b13e 100644
--- a/crashreporter/src/main/java/com/balsikandar/crashreporter/CrashReporterInitProvider.java
+++ b/crashreporter/src/main/java/com/balsikandar/crashreporter/CrashReporterInitProvider.java
@@ -10,12 +10,13 @@
 import android.content.pm.ProviderInfo;
 import android.database.Cursor;
 import android.net.Uri;
+import android.support.v4.content.FileProvider;
 
 /**
  * Created by amitshekhar on 16/11/16.
  */
 
-public class CrashReporterInitProvider extends ContentProvider {
+public class CrashReporterInitProvider extends FileProvider {
 
 
     public CrashReporterInitProvider() {
diff --git a/crashreporter/src/main/java/com/balsikandar/crashreporter/ui/LogMessageActivity.java b/crashreporter/src/main/java/com/balsikandar/crashreporter/ui/LogMessageActivity.java
index 55c6fd2..832fc20 100644
--- a/crashreporter/src/main/java/com/balsikandar/crashreporter/ui/LogMessageActivity.java
+++ b/crashreporter/src/main/java/com/balsikandar/crashreporter/ui/LogMessageActivity.java
@@ -3,6 +3,7 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.support.v4.content.FileProvider;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
@@ -75,10 +76,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
     }
 
     private void shareCrashReport(String filePath) {
+        Uri uri = FileProvider.getUriForFile(this, getPackageName() + ".CrashReporterInitProvider", new File(filePath));
         Intent intent = new Intent(Intent.ACTION_SEND);
         intent.setType("*/*");
         intent.putExtra(Intent.EXTRA_TEXT, appInfo.getText().toString());
-        intent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(new File(filePath)));
+        intent.putExtra(Intent.EXTRA_STREAM, uri);
         startActivity(Intent.createChooser(intent, "Share via"));
     }
 }
diff --git a/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/CrashUtil.java b/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/CrashUtil.java
index 021577c..27e7093 100644
--- a/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/CrashUtil.java
+++ b/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/CrashUtil.java
@@ -91,19 +91,19 @@ private static void writeToFile(String crashReportPath, String filename, String
     }
 
     private static void showNotification(String localisedMsg, boolean isCrash) {
+        Context context = CrashReporter.getContext();
+
+        Intent intent = CrashReporter.getLaunchIntent();
+        intent.putExtra(Constants.LANDING, isCrash);
+        intent.setAction(Long.toString(System.currentTimeMillis()));
 
         if (CrashReporter.isNotificationEnabled()) {
-            Context context = CrashReporter.getContext();
             NotificationManager notificationManager = (NotificationManager) context.
                     getSystemService(NOTIFICATION_SERVICE);
             createNotificationChannel(notificationManager, context);
             NotificationCompat.Builder builder = new NotificationCompat.Builder(context, CHANNEL_NOTIFICATION_ID);
             builder.setSmallIcon(R.drawable.ic_warning_black_24dp);
 
-            Intent intent = CrashReporter.getLaunchIntent();
-            intent.putExtra(Constants.LANDING, isCrash);
-            intent.setAction(Long.toString(System.currentTimeMillis()));
-
             PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, 0);
             builder.setContentIntent(pendingIntent);
 
@@ -119,6 +119,8 @@ private static void showNotification(String localisedMsg, boolean isCrash) {
             builder.setColor(ContextCompat.getColor(context, R.color.colorAccent_CrashReporter));
 
             notificationManager.notify(Constants.NOTIFICATION_ID, builder.build());
+        } else {
+            context.startActivity(intent);
         }
     }
 
diff --git a/crashreporter/src/main/res/xml/provider_paths.xml b/crashreporter/src/main/res/xml/provider_paths.xml
new file mode 100644
index 0000000..ffa74ab
--- /dev/null
+++ b/crashreporter/src/main/res/xml/provider_paths.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <external-path name="external_files" path="."/>
+</paths>
\ No newline at end of file