diff --git a/totalRP3/core/impl/globals.lua b/totalRP3/core/impl/globals.lua
index 3a3435dcd..e31c57d9a 100644
--- a/totalRP3/core/impl/globals.lua
+++ b/totalRP3/core/impl/globals.lua
@@ -38,8 +38,8 @@ TRP3_API = {
 		addon_name_me = "Total RP 3",
 		addon_id_length = 15,
 
-		version = 21,
-		version_display = "1.2.1",
+		version = 22,
+		version_display = "1.2.1.1",
 
 		player = UnitName("player"),
 		player_realm = GetRealmName(),
diff --git a/totalRP3/modules/register/main/register_exchange.lua b/totalRP3/modules/register/main/register_exchange.lua
index 5daf0f86e..8d50ff379 100644
--- a/totalRP3/modules/register/main/register_exchange.lua
+++ b/totalRP3/modules/register/main/register_exchange.lua
@@ -230,6 +230,9 @@ local function incomingVernumQuery(structure, senderID)
 	local senderProfileID = structure[VERNUM_QUERY_INDEX_CHARACTER_PROFILE];
 	local senderExtendedVersion = structure[VERNUM_QUERY_INDEX_EXTENDED];
 
+	senderVersion = tonumber(senderVersion) or 0;
+	senderExtendedVersion = tonumber(senderExtendedVersion) or 0;
+
 	local clientName = Globals.addon_name;
 	if senderExtendedVersion then
 		clientName = Globals.addon_name_extended;
@@ -444,7 +447,8 @@ function TRP3_API.register.inits.dataExchangeInit()
 
 	-- When receiving HELLO from someone else (from the other side ?)
 	Comm.broadcast.registerCommand(Comm.broadcast.HELLO_CMD, function(sender, version, versionDisplay, extendedVersion)
-		version = tonumber(version);
+		version = tonumber(version) or 0;
+		extendedVersion = tonumber(extendedVersion) or 0;
 		-- Only treat the message if it does not come from us
 		if sender ~= Globals.player_id then
 			checkVersion(sender, version, versionDisplay, extendedVersion);
diff --git a/totalRP3/totalRP3.toc b/totalRP3/totalRP3.toc
index d8493ec52..ddf741122 100644
--- a/totalRP3/totalRP3.toc
+++ b/totalRP3/totalRP3.toc
@@ -1,7 +1,7 @@
 ## Interface: 70000
 ## Title: Total RP 3
 ## Author: Telkostrasz & Ellypse
-## Version: 1.2.1
+## Version: 1.2.1.1
 ## Notes: Main addon
 ## URL: http://totalrp3.info
 ## RequiredDeps: