diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m
index 2774aa649..452401323 100644
--- a/Signal/src/AppDelegate.m
+++ b/Signal/src/AppDelegate.m
@@ -1418,12 +1418,10 @@ static NSTimeInterval launchStartedAt;
     NSArray *messages = (NSArray *)notification.userInfo[@"messages"];
     for (SSKProtoEnvelope *envelope in messages) {
         OWSLogInfo(@"[Loki] Received messages from long polling");
-        @try {
-            NSData *envelopeData = envelope.serializedDataIgnoringErrors;
-            if (envelopeData != nil) {
-                [SSKEnvironment.shared.messageReceiver handleReceivedEnvelopeData:envelopeData];
-            }
-        } @catch (NSException *exception) {
+        NSData *envelopeData = envelope.serializedDataIgnoringErrors;
+        if (envelopeData != nil) {
+            [SSKEnvironment.shared.messageReceiver handleReceivedEnvelopeData:envelopeData];
+        } else {
             OWSFailDebug(@"Failed to serialize envelope");
         }
     }
diff --git a/SignalMessaging/Views/AvatarImageView.swift b/SignalMessaging/Views/AvatarImageView.swift
index e08f6cd79..9e0d0d300 100644
--- a/SignalMessaging/Views/AvatarImageView.swift
+++ b/SignalMessaging/Views/AvatarImageView.swift
@@ -3,6 +3,7 @@
 //
 
 import UIKit
+import SignalServiceKit
 
 @objc
 public class AvatarImageView: UIImageView {