diff --git a/Passepartout-iOS/Scenes/ServiceViewController.swift b/Passepartout-iOS/Scenes/ServiceViewController.swift
index a0eca686..7f06d6a9 100644
--- a/Passepartout-iOS/Scenes/ServiceViewController.swift
+++ b/Passepartout-iOS/Scenes/ServiceViewController.swift
@@ -248,7 +248,9 @@ class ServiceViewController: UIViewController, StrongTableHost {
     }
     
     private func doRenameCurrentProfile(to newId: String) {
-        let renamedProfile = service.renameProfile(uncheckedHostProfile, to: newId)
+        guard let renamedProfile = service.renameProfile(uncheckedHostProfile, to: newId) else {
+            return
+        }
         setProfile(renamedProfile, reloadingViews: false)
     }
     
diff --git a/Submodules/Core b/Submodules/Core
index 149e95d9..b3db94cc 160000
--- a/Submodules/Core
+++ b/Submodules/Core
@@ -1 +1 @@
-Subproject commit 149e95d9727e504c96b3e6ec0d822c195782299a
+Subproject commit b3db94cc44f989553c5a45ad1a1126ab6fb14254