diff --git a/android-json-form-wizard/build.gradle b/android-json-form-wizard/build.gradle
index 709beae15..eac01747b 100644
--- a/android-json-form-wizard/build.gradle
+++ b/android-json-form-wizard/build.gradle
@@ -151,7 +151,7 @@ dependencies {
     implementation "org.greenrobot:eventbus:3.2.0"
     implementation 'androidx.multidex:multidex:2.0.1'
 
-    implementation 'io.sentry:sentry-android:5.0.1'
+    api 'io.sentry:sentry-android:5.0.1'
 
     // PowerMock
     def powerMockVersion = '2.0.9'
diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/activities/JsonFormBaseActivity.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/activities/JsonFormBaseActivity.java
index 48c79d7ae..c1f9aaa5f 100644
--- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/activities/JsonFormBaseActivity.java
+++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/activities/JsonFormBaseActivity.java
@@ -43,8 +43,6 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import io.sentry.ITransaction;
-import io.sentry.Sentry;
 import timber.log.Timber;
 
 import static com.vijay.jsonwizard.utils.NativeFormLangUtils.getTranslatedString;
@@ -84,7 +82,6 @@ public abstract class JsonFormBaseActivity extends MultiLanguageActivity impleme
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.native_form_activity_json_form);
-        ITransaction transaction = Sentry.startTransaction("revealFormOpening", "insideJsonFormBase oncreate");
         findViewById(R.id.native_form_activity).setFilterTouchesWhenObscured(true);
         mToolbar = findViewById(R.id.tb_top);
         setSupportActionBar(mToolbar);
@@ -112,8 +109,6 @@ protected void onCreate(Bundle savedInstanceState) {
         for (LifeCycleListener lifeCycleListener : lifeCycleListeners) {
             lifeCycleListener.onCreate(savedInstanceState);
         }
-
-        transaction.finish();
     }
 
     private String readDataSource() {
diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/Utils.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/Utils.java
index 4a011ba03..7ba534d22 100644
--- a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/Utils.java
+++ b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/Utils.java
@@ -795,6 +795,7 @@ public static boolean isEmptyJsonObject(JSONObject jsonObject) {
      * @return
      * @throws JSONException
      */
+    @Nullable
     public static JSONObject getRepeatingGroupCountObj(@NotNull WidgetArgs widgetArgs) throws JSONException {
         String repeatingGroupCountObjKey = widgetArgs.getJsonObject().get(KEY) + "_count";
         JSONObject stepJsonObject = widgetArgs.getFormFragment().getStep(widgetArgs.getStepName());
diff --git a/sample/build.gradle b/sample/build.gradle
index 81bfb98d6..5f5e2113b 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -29,6 +29,8 @@ android {
         versionCode 1
         versionName "1.0"
         multiDexEnabled true
+
+        buildConfigField("String", "SENTRY_DSN", "\"" + getProps("sentry.dsn") + "\"")
     }
 
     buildTypes {
@@ -60,3 +62,14 @@ dependencies {
 
     implementation 'org.smartregister:opensrp-client-utils:0.0.6-SNAPSHOT'
 }
+
+// get property from local.properties
+def getProps(String propName) {
+    def propsFile = rootProject.file('local.properties')
+    if (propsFile.exists()) {
+        def props = new Properties()
+        props.load(new FileInputStream(propsFile))
+        return props[propName]
+    }
+    return "";
+}
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index 75c11a6ab..1eae6330d 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -11,6 +11,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
+        android:name=".MainApplication"
         android:theme="@style/NativeFormsAppTheme">
         <activity
             android:name=".MainActivity"
diff --git a/sample/src/main/java/org/smartregister/nativeform/MainActivity.java b/sample/src/main/java/org/smartregister/nativeform/MainActivity.java
index 7a1f3469f..1d1319864 100644
--- a/sample/src/main/java/org/smartregister/nativeform/MainActivity.java
+++ b/sample/src/main/java/org/smartregister/nativeform/MainActivity.java
@@ -19,6 +19,9 @@
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import io.sentry.ITransaction;
+import io.sentry.Sentry;
+
 public class MainActivity extends AppCompatActivity implements View.OnClickListener {
     private static final int REQUEST_CODE_GET_JSON = 1234;
     private static final String TAG = MainActivity.class.getCanonicalName();
@@ -97,6 +100,8 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 
     public void startForm(int jsonFormActivityRequestCode, String formName, String entityId, boolean translate) throws Exception {
 
+        ITransaction transaction = Sentry.startTransaction("#startForm", String.format("formName: %s", formName.toUpperCase()));
+
         final String STEP1 = "step1";
         final String FIELDS = "fields";
         final String KEY = "key";
@@ -255,7 +260,7 @@ public void startForm(int jsonFormActivityRequestCode, String formName, String e
                     break;
                 }
             }
-
+            transaction.finish();
         }
 
     }
diff --git a/sample/src/main/java/org/smartregister/nativeform/MainApplication.java b/sample/src/main/java/org/smartregister/nativeform/MainApplication.java
new file mode 100644
index 000000000..5a0b3e12a
--- /dev/null
+++ b/sample/src/main/java/org/smartregister/nativeform/MainApplication.java
@@ -0,0 +1,22 @@
+package org.smartregister.nativeform;
+
+import android.app.Application;
+
+import io.sentry.android.core.SentryAndroid;
+
+public class MainApplication extends Application {
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        //noinspection ConstantConditions
+        if (!BuildConfig.SENTRY_DSN.trim().isEmpty()) {
+            SentryAndroid.init(this, options -> {
+                options.setEnvironment("opensrp-native-form-sample");
+                options.setDsn(BuildConfig.SENTRY_DSN.trim());
+            });
+        }
+
+    }
+}