diff --git a/sdk/lint-baseline.xml b/sdk/lint-baseline.xml
index 0c900ea019..776acbdbca 100644
--- a/sdk/lint-baseline.xml
+++ b/sdk/lint-baseline.xml
@@ -925,336 +925,6 @@
             column="26"/>
     </issue>
 
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void update(Observable observable, Object arg) {"
-        errorLine2="                       ~~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="76"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void update(Observable observable, Object arg) {"
-        errorLine2="                                              ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="76"
-            column="47"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public String getAppVersion() {"
-        errorLine2="           ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="98"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setAppVersion(String appVersion) {"
-        errorLine2="                              ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="108"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public String getContext() {"
-        errorLine2="           ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="120"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setContext(String context) {"
-        errorLine2="                           ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="131"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public String getEndpoint() {"
-        errorLine2="           ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="143"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setEndpoint(String endpoint) {"
-        errorLine2="                            ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="157"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public String getSessionEndpoint() {"
-        errorLine2="           ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="201"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setSessionEndpoint(String endpoint) {"
-        errorLine2="                                   ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="215"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public String getBuildUUID() {"
-        errorLine2="           ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="225"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setBuildUUID(String buildUuid) {"
-        errorLine2="                             ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="238"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public String[] getFilters() {"
-        errorLine2="           ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="250"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setFilters(String[] filters) {"
-        errorLine2="                           ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="267"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public String[] getIgnoreClasses() {"
-        errorLine2="           ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="276"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setIgnoreClasses(String[] ignoreClasses) {"
-        errorLine2="                                 ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="289"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public String[] getProjectPackages() {"
-        errorLine2="           ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="323"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setProjectPackages(String[] projectPackages) {"
-        errorLine2="                                   ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="339"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public String getReleaseStage() {"
-        errorLine2="           ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="348"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setReleaseStage(String releaseStage) {"
-        errorLine2="                                ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="360"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setNotifierType(String notifierType) {"
-        errorLine2="                                ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="546"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setCodeBundleId(String codeBundleId) {"
-        errorLine2="                                ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="554"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Map&lt;String, String> getErrorApiHeaders() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="627"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Map&lt;String, String> getSessionApiHeaders() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="640"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void beforeSend(BeforeSend beforeSend) {"
-        errorLine2="                           ~~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="669"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    protected boolean shouldNotifyForReleaseStage(String releaseStage) {"
-        errorLine2="                                                  ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="681"
-            column="51"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    protected boolean shouldIgnoreClass(String className) {"
-        errorLine2="                                        ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="696"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    protected void beforeNotify(BeforeNotify beforeNotify) {"
-        errorLine2="                                ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="710"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    protected void beforeRecordBreadcrumb(BeforeRecordBreadcrumb beforeRecordBreadcrumb) {"
-        errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="721"
-            column="43"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    protected Collection&lt;BeforeRecordBreadcrumb> getBeforeRecordBreadcrumbTasks() {"
-        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="750"
-            column="15"/>
-    </issue>
-
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
diff --git a/sdk/src/main/java/com/bugsnag/android/Configuration.java b/sdk/src/main/java/com/bugsnag/android/Configuration.java
index 0d466ec0dd..31b86309d2 100644
--- a/sdk/src/main/java/com/bugsnag/android/Configuration.java
+++ b/sdk/src/main/java/com/bugsnag/android/Configuration.java
@@ -73,7 +73,7 @@ public Configuration(@NonNull String apiKey) {
     /**
      * Respond to an update notification from observed objects, like MetaData
      */
-    public void update(Observable observable, Object arg) {
+    public void update(@NonNull Observable observable, @NonNull Object arg) {
         if (arg instanceof NativeInterface.Message) {
             setChanged();
             notifyObservers(arg);
@@ -95,6 +95,7 @@ public String getApiKey() {
      *
      * @return App Version
      */
+    @NonNull
     public String getAppVersion() {
         return appVersion;
     }
@@ -105,7 +106,7 @@ public String getAppVersion() {
      *
      * @param appVersion the app version to send
      */
-    public void setAppVersion(String appVersion) {
+    public void setAppVersion(@NonNull String appVersion) {
         this.appVersion = appVersion;
         setChanged();
         notifyObservers(new NativeInterface.Message(
@@ -117,6 +118,7 @@ public void setAppVersion(String appVersion) {
      *
      * @return Context
      */
+    @Nullable
     public String getContext() {
         return context;
     }
@@ -128,7 +130,7 @@ public String getContext() {
      *
      * @param context set what was happening at the time of a crash
      */
-    public void setContext(String context) {
+    public void setContext(@Nullable String context) {
         this.context = context;
         setChanged();
         notifyObservers(new NativeInterface.Message(
@@ -140,6 +142,7 @@ public void setContext(String context) {
      *
      * @return Endpoint
      */
+    @NonNull
     public String getEndpoint() {
         return endpoint;
     }
@@ -154,7 +157,7 @@ public String getEndpoint() {
      * @deprecated use {@link com.bugsnag.android.Configuration#setEndpoints(String, String)}
      */
     @Deprecated
-    public void setEndpoint(String endpoint) {
+    public void setEndpoint(@NonNull String endpoint) {
         this.endpoint = endpoint;
     }
 
@@ -198,6 +201,7 @@ public void setEndpoints(@NonNull String notify, @NonNull String sessions)
      *
      * @return the endpoint
      */
+    @NonNull
     public String getSessionEndpoint() {
         return sessionEndpoint;
     }
@@ -212,7 +216,7 @@ public String getSessionEndpoint() {
      * @deprecated use {@link com.bugsnag.android.Configuration#setEndpoints(String, String)}
      */
     @Deprecated
-    public void setSessionEndpoint(String endpoint) {
+    public void setSessionEndpoint(@NonNull String endpoint) {
         this.sessionEndpoint = endpoint;
     }
 
@@ -222,6 +226,7 @@ public void setSessionEndpoint(String endpoint) {
      * @return build UUID
      */
     @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
+    @Nullable
     public String getBuildUUID() {
         return buildUuid;
     }
@@ -235,7 +240,7 @@ public String getBuildUUID() {
      * @param buildUuid the buildUUID.
      */
     @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
-    public void setBuildUUID(String buildUuid) {
+    public void setBuildUUID(@Nullable String buildUuid) {
         this.buildUuid = buildUuid;
         setChanged();
         notifyObservers(new NativeInterface.Message(
@@ -247,6 +252,7 @@ public void setBuildUUID(String buildUuid) {
      *
      * @return Filters
      */
+    @NonNull
     public String[] getFilters() {
         return metaData.getFilters();
     }
@@ -264,7 +270,7 @@ public String[] getFilters() {
      *
      * @param filters a list of keys to filter from metaData
      */
-    public void setFilters(String[] filters) {
+    public void setFilters(@NonNull String[] filters) {
         this.metaData.setFilters(filters);
     }
 
@@ -273,6 +279,7 @@ public void setFilters(String[] filters) {
      *
      * @return Ignore classes
      */
+    @Nullable
     public String[] getIgnoreClasses() {
         return ignoreClasses;
     }
@@ -286,7 +293,7 @@ public String[] getIgnoreClasses() {
      *
      * @param ignoreClasses a list of exception classes to ignore
      */
-    public void setIgnoreClasses(String[] ignoreClasses) {
+    public void setIgnoreClasses(@NonNull String[] ignoreClasses) {
         this.ignoreClasses = ignoreClasses;
     }
 
@@ -311,7 +318,7 @@ public String[] getNotifyReleaseStages() {
      * @param notifyReleaseStages a list of releaseStages to notify for
      * @see #setReleaseStage
      */
-    public void setNotifyReleaseStages(@Nullable String[] notifyReleaseStages) {
+    public void setNotifyReleaseStages(@NonNull String[] notifyReleaseStages) {
         this.notifyReleaseStages = notifyReleaseStages;
     }
 
@@ -320,6 +327,7 @@ public void setNotifyReleaseStages(@Nullable String[] notifyReleaseStages) {
      *
      * @return packages
      */
+    @Nullable
     public String[] getProjectPackages() {
         return projectPackages;
     }
@@ -336,7 +344,7 @@ public String[] getProjectPackages() {
      *
      * @param projectPackages a list of package names
      */
-    public void setProjectPackages(String[] projectPackages) {
+    public void setProjectPackages(@NonNull String[] projectPackages) {
         this.projectPackages = projectPackages;
     }
 
@@ -345,6 +353,7 @@ public void setProjectPackages(String[] projectPackages) {
      *
      * @return release stage
      */
+    @Nullable
     public String getReleaseStage() {
         return releaseStage;
     }
@@ -357,7 +366,7 @@ public String getReleaseStage() {
      * @param releaseStage the release stage of the app
      * @see #setNotifyReleaseStages
      */
-    public void setReleaseStage(String releaseStage) {
+    public void setReleaseStage(@Nullable String releaseStage) {
         this.releaseStage = releaseStage;
         setChanged();
         notifyObservers(new NativeInterface.Message(
@@ -543,7 +552,7 @@ public void setAutomaticallyCollectBreadcrumbs(boolean automaticallyCollectBread
      * Intended for internal use only - sets the type of the notifier (e.g. Android, React Native)
      * @param notifierType the notifier type
      */
-    public void setNotifierType(String notifierType) {
+    public void setNotifierType(@NonNull String notifierType) {
         this.notifierType = notifierType;
     }
 
@@ -551,7 +560,7 @@ public void setNotifierType(String notifierType) {
      * Intended for internal use only - sets the code bundle id for React Native
      * @param codeBundleId the code bundle id
      */
-    public void setCodeBundleId(String codeBundleId) {
+    public void setCodeBundleId(@Nullable String codeBundleId) {
         this.codeBundleId = codeBundleId;
     }
 
@@ -624,6 +633,7 @@ public void setDelivery(@NonNull Delivery delivery) {
      *
      * @return the HTTP headers
      */
+    @NonNull
     public Map<String, String> getErrorApiHeaders() {
         Map<String, String> map = new HashMap<>();
         map.put(HEADER_API_PAYLOAD_VERSION, "4.0");
@@ -637,6 +647,7 @@ public Map<String, String> getErrorApiHeaders() {
      *
      * @return the HTTP headers
      */
+    @NonNull
     public Map<String, String> getSessionApiHeaders() {
         Map<String, String> map = new HashMap<>();
         map.put(HEADER_API_PAYLOAD_VERSION, "1.0");
@@ -666,7 +677,7 @@ public Map<String, String> getSessionApiHeaders() {
      * @see BeforeSend
      * @see Report
      */
-    public void beforeSend(BeforeSend beforeSend) {
+    public void beforeSend(@NonNull BeforeSend beforeSend) {
         if (!beforeSendTasks.contains(beforeSend)) {
             beforeSendTasks.add(beforeSend);
         }
@@ -678,7 +689,7 @@ public void beforeSend(BeforeSend beforeSend) {
      * @param releaseStage the release stage to check
      * @return true if the release state should be notified else false
      */
-    protected boolean shouldNotifyForReleaseStage(String releaseStage) {
+    protected boolean shouldNotifyForReleaseStage(@Nullable String releaseStage) {
         if (this.notifyReleaseStages == null) {
             return true;
         }
@@ -693,7 +704,7 @@ protected boolean shouldNotifyForReleaseStage(String releaseStage) {
      * @param className the exception class to check
      * @return true if the exception class should be ignored else false
      */
-    protected boolean shouldIgnoreClass(String className) {
+    protected boolean shouldIgnoreClass(@Nullable String className) {
         if (this.ignoreClasses == null) {
             return false;
         }
@@ -707,7 +718,7 @@ protected boolean shouldIgnoreClass(String className) {
      *
      * @param beforeNotify the new before notify task
      */
-    protected void beforeNotify(BeforeNotify beforeNotify) {
+    protected void beforeNotify(@NonNull BeforeNotify beforeNotify) {
         if (!beforeNotifyTasks.contains(beforeNotify)) {
             beforeNotifyTasks.add(beforeNotify);
         }
@@ -718,7 +729,7 @@ protected void beforeNotify(BeforeNotify beforeNotify) {
      *
      * @param beforeRecordBreadcrumb the new before breadcrumb task
      */
-    protected void beforeRecordBreadcrumb(BeforeRecordBreadcrumb beforeRecordBreadcrumb) {
+    protected void beforeRecordBreadcrumb(@NonNull BeforeRecordBreadcrumb beforeRecordBreadcrumb) {
         if (!beforeRecordBreadcrumbTasks.contains(beforeRecordBreadcrumb)) {
             beforeRecordBreadcrumbTasks.add(beforeRecordBreadcrumb);
         }
@@ -747,6 +758,7 @@ protected boolean inProject(@NonNull String className) {
      *
      * @return the before breadcrumb tasks
      */
+    @NonNull
     protected Collection<BeforeRecordBreadcrumb> getBeforeRecordBreadcrumbTasks() {
         return beforeRecordBreadcrumbTasks;
     }