diff --git a/rpcs3/Emu/NP/rpcn_config.cpp b/rpcs3/Emu/NP/rpcn_config.cpp
index 0b5cabe768..6665adbf7d 100644
--- a/rpcs3/Emu/NP/rpcn_config.cpp
+++ b/rpcs3/Emu/NP/rpcn_config.cpp
@@ -10,8 +10,7 @@ void cfg_rpcn::load()
 {
 	const std::string path = cfg_rpcn::get_path();
 
-	fs::file cfg_file(path, fs::read);
-	if (cfg_file)
+	if (fs::file cfg_file(path, fs::read); cfg_file)
 	{
 		rpcn_log.notice("Loading RPCN config. Path: %s", path);
 		from_string(cfg_file.to_string());
diff --git a/rpcs3/Emu/NP/rpcn_config.h b/rpcs3/Emu/NP/rpcn_config.h
index 3ea6b707b1..113d83e408 100644
--- a/rpcs3/Emu/NP/rpcn_config.h
+++ b/rpcs3/Emu/NP/rpcn_config.h
@@ -4,7 +4,7 @@
 
 struct cfg_rpcn : cfg::node
 {
-	cfg::uint32 version{this, "Version", 1};
+	cfg::uint32 version{this, "Version", 2};
 	cfg::string host{this, "Host", "np.rpcs3.net"};
 	cfg::string npid{this, "NPID", ""};
 	cfg::string password{this, "Password", ""};
diff --git a/rpcs3/rpcs3qt/rpcn_settings_dialog.cpp b/rpcs3/rpcs3qt/rpcn_settings_dialog.cpp
index 6de6007b31..cab71be3bc 100644
--- a/rpcs3/rpcs3qt/rpcn_settings_dialog.cpp
+++ b/rpcs3/rpcs3qt/rpcn_settings_dialog.cpp
@@ -1347,7 +1347,10 @@ rpcn_friends_dialog::rpcn_friends_dialog(QWidget* parent)
 
 rpcn_friends_dialog::~rpcn_friends_dialog()
 {
-	m_rpcn->remove_friend_cb(friend_callback, this);
+	if (m_rpcn)
+	{
+		m_rpcn->remove_friend_cb(friend_callback, this);
+	}
 }
 
 bool rpcn_friends_dialog::add_friend_with_error_dialog(const std::string& friend_username)