diff --git a/Client.cpp b/Client.cpp
index 0d2a7c65..ab1aa330 100644
--- a/Client.cpp
+++ b/Client.cpp
@@ -810,6 +810,11 @@ void CClient::UserCommand(const CString& sLine) {
 	} else if (sCommand.CaseCmp("JUMP") == 0 ||
 			sCommand.CaseCmp("CONNECT") == 0) {
 		if (m_pUser) {
+			if (!m_pUser->HasServers()) {
+				PutStatus("You don't have any servers added.");
+				return;
+			}
+
 			if (m_pIRCSock) {
 				m_pIRCSock->Quit();
 				PutStatus("Jumping to the next server in the list...");