diff --git a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_native.cpp b/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_native.cpp index 8fd1e446e1..ceab0c603a 100644 --- a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_native.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_native.cpp @@ -59,8 +59,10 @@ lv2_socket_native::~lv2_socket_native() if (bound_port) { - auto& nph = g_fxo->get>(); - nph.upnp_remove_port_mapping(bound_port, type == SYS_NET_SOCK_STREAM ? "TCP" : "UDP"); + if (auto* nph = g_fxo->try_get>()) + { + nph->upnp_remove_port_mapping(bound_port, type == SYS_NET_SOCK_STREAM ? "TCP" : "UDP"); + } bound_port = 0; } } diff --git a/rpcs3/Emu/Cell/lv2/sys_net/nt_p2p_port.cpp b/rpcs3/Emu/Cell/lv2/sys_net/nt_p2p_port.cpp index c95a07f640..6bddcea429 100644 --- a/rpcs3/Emu/Cell/lv2/sys_net/nt_p2p_port.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_net/nt_p2p_port.cpp @@ -91,8 +91,10 @@ nt_p2p_port::~nt_p2p_port() #endif } - auto& nph = g_fxo->get>(); - nph.upnp_remove_port_mapping(port, "UDP"); + if (auto* nph = g_fxo->try_get>()) + { + nph->upnp_remove_port_mapping(port, "UDP"); + } } void nt_p2p_port::dump_packet(p2ps_encapsulated_tcp* tcph)