diff --git a/Meshtastic/Helpers/MeshPackets.swift b/Meshtastic/Helpers/MeshPackets.swift
index ee329f8c..58d58e14 100644
--- a/Meshtastic/Helpers/MeshPackets.swift
+++ b/Meshtastic/Helpers/MeshPackets.swift
@@ -517,11 +517,11 @@ func adminAppPacket (packet: MeshPacket, context: NSManagedObjectContext) {
 								.replacingOccurrences(of: "11: ", with: "")
 								.replacingOccurrences(of: "\"", with: "")
 								.trimmingCharacters(in: .whitespacesAndNewlines)
-								.components(separatedBy: "\n")[0]
+								.components(separatedBy: "\n").first ?? ""
 							fetchedNode[0].cannedMessageConfig?.messages = messages
 							do {
 								try context.save()
-								Logger.data.info("💾 Updated Canned Messages Messages For: \(fetchedNode[0].num.toHex(), privacy: .public)")
+								Logger.data.info("💾 Updated Canned Messages Messages For: \(fetchedNode.first?.num.toHex() ?? "Unknown".localized), privacy: .public)")
 							} catch {
 								context.rollback()
 								let nsError = error as NSError
diff --git a/protobufs b/protobufs
index 27fac391..816595c8 160000
--- a/protobufs
+++ b/protobufs
@@ -1 +1 @@
-Subproject commit 27fac39141d99fe727a0a1824c5397409b1aea75
+Subproject commit 816595c8bbdfc3b4388e11348ccd043294d58705