diff --git a/common/src/main/java/ctbrec/sites/mfc/MyFreeCamsClient.java b/common/src/main/java/ctbrec/sites/mfc/MyFreeCamsClient.java
index 70b7ad8a..bea83a7f 100644
--- a/common/src/main/java/ctbrec/sites/mfc/MyFreeCamsClient.java
+++ b/common/src/main/java/ctbrec/sites/mfc/MyFreeCamsClient.java
@@ -617,9 +617,13 @@ public class MyFreeCamsClient {
         lock.lock();
         try {
             for (SessionState state : sessionStates.asMap().values()) {
-                String nm = Optional.ofNullable(state.getNm()).orElse("");
-                String name = Optional.ofNullable(model.getName()).orElse("");
-                if (Objects.equals(nm.toLowerCase(), name.toLowerCase()) || Objects.equals(model.getUid(), state.getUid()) && state.getUid() > 0) {
+                Optional<String> nm = Optional.ofNullable(state.getNm());
+                Optional<String> name = Optional.ofNullable(model.getName());
+                if(!nm.isPresent() || !name.isPresent()) {
+                    continue;
+                }
+
+                if (Objects.equals(nm.get().toLowerCase(), name.get().toLowerCase()) || Objects.equals(model.getUid(), state.getUid()) && state.getUid() > 0) {
                     model.update(state, getStreamUrl(state));
                     return;
                 }