1 files changed, 6 insertions, 1 deletions
diff --git a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/manager/SnippetManager.java b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/manager/SnippetManager.java
index 9632b8b..7580441 100644
--- a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/manager/SnippetManager.java
+++ b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/manager/SnippetManager.java
@@ -95,7 +95,12 @@ public class SnippetManager {
             throw new IllegalStateException("SnippetManager should not be re-initialized");
         }
         // Add custom object converter if user provided one.
-        SnippetObjectConverterManager.addConverter(findSnippetObjectConverterFromMetadata(context));
+        Class<? extends SnippetObjectConverter> converterClazz =
+                findSnippetObjectConverterFromMetadata(context);
+        if (converterClazz != null) {
+            Log.d("Found custom converter class, adding...");
+            SnippetObjectConverterManager.addConverter(converterClazz);
+        }
         Collection<Class<? extends Snippet>> classList = findSnippetClassesFromMetadata(context);
         sInstance = new SnippetManager(classList);
         return sInstance;