diff --git a/coreapi/account_creator.c b/coreapi/account_creator.c
index c929fb40a..0e1960c0e 100644
--- a/coreapi/account_creator.c
+++ b/coreapi/account_creator.c
@@ -148,6 +148,7 @@ static LinphoneAccountCreatorStatus validate_uri(const char* username, const cha
 
 	if (addr == NULL) {
 		status = LinphoneAccountCreatorUsernameInvalid;
+		goto end;
 	}
 
 	if (domain && linphone_address_set_domain(addr, domain) != 0) {
@@ -157,7 +158,6 @@ static LinphoneAccountCreatorStatus validate_uri(const char* username, const cha
 	if (display_name && linphone_address_set_display_name(addr, display_name) != 0) {
 		status = LinphoneAccountCreatorDisplayNameInvalid;
 	}
-
 	linphone_address_unref(addr);
 end:
 	linphone_proxy_config_destroy(proxy);