diff --git a/admin/srvconvert.c b/admin/srvconvert.c
index 0fdd572fb..48b33468f 100644
--- a/admin/srvconvert.c
+++ b/admin/srvconvert.c
@@ -123,18 +123,14 @@ srvconv(int argc, char **argv)
 	}
 	ret = krb5_425_conv_principal(context, service, instance, realm,
 				      &entry.principal);
-	if (ret) {
-	    krb5_warn(context, ret, "krb5_425_conv_principal (%s.%s@%s)",
-		      service, instance, realm);
-	    free(service);
-	    free(instance);
-	    free(realm);
-	    break;
-	}
-	
 	free(service);
 	free(instance);
 	free(realm);
+	if (ret) {
+	    krb5_warn(context, ret, "krb5_425_conv_principal (%s.%s@%s)",
+		      service, instance, realm);
+	    break;
+	}
 	
 	ret = krb5_ret_int8(sp, &kvno);
 	if(ret) {