diff --git a/library/adenroll.c b/library/adenroll.c
index 0154ac5..52aa8a8 100644
--- a/library/adenroll.c
+++ b/library/adenroll.c
@@ -1604,7 +1604,7 @@ load_host_keytab (adcli_enroll *enroll)
 	}
 
 	krb5_free_context (k5);
-	return ADCLI_SUCCESS;
+	return res;
 }
 
 typedef struct {
@@ -1785,12 +1785,12 @@ add_principal_to_keytab (adcli_enroll *enroll,
 		                                       enroll->kvno, &password, enctypes, &salts[*which_salt]);
 
 		free_principal_salts (k5, salts);
+	}
 
-		if (code != 0) {
-			_adcli_err ("Couldn't add keytab entries: %s: %s",
-			            enroll->keytab_name, krb5_get_error_message (k5, code));
-			return ADCLI_ERR_FAIL;
-		}
+	if (code != 0) {
+		_adcli_err ("Couldn't add keytab entries: %s: %s",
+		            enroll->keytab_name, krb5_get_error_message (k5, code));
+		return ADCLI_ERR_FAIL;
 	}