diff --git a/SingularSDK/Runtime/SingularSDK.cs b/SingularSDK/Runtime/SingularSDK.cs
index ad3524e..16c5818 100644
--- a/SingularSDK/Runtime/SingularSDK.cs
+++ b/SingularSDK/Runtime/SingularSDK.cs
@@ -962,7 +962,7 @@ private void SingularDeviceAttributionCallback(string handlerParamsJson)
             Debug.Log(string.Format("SingularSDK SingularDeviceAttributionCallback called! message='{0}'",
                 handlerParamsJson));
 
-            if (handlerParamsJson != null)
+            if (registeredDeviceAttributionCallbackHandler != null && handlerParamsJson != null)
             {
                 Dictionary<string, object> attributes =
                     JsonConvert.DeserializeObject<Dictionary<string, object>>(handlerParamsJson);
@@ -1038,14 +1038,11 @@ private void ResolveSingularLink()
             {
                 if (registeredSingularLinkHandler != null)
                 {
-
                     registeredSingularLinkHandler.OnSingularLinkResolved(instance.resolvedSingularLinkParams);
                     instance.resolvedSingularLinkParams = null;
-
                 }
                 else if (registeredDDLHandler != null)
                 {
-
                     if (ddlTimeoutSec <= 0)
                     {
                         ddlTimeoutSec = DEFAULT_DDL_TIMEOUT;
@@ -1139,8 +1136,7 @@ private void SingularSdidReceived(string result)
         }
 
         #endregion // end sdid
-
-
+        
 #if UNITY_5_3_OR_NEWER && UNITY_PURCHASING
 
     public static void InAppPurchase(IEnumerable<Product> products, Dictionary<string, object> attributes, bool isRestored