diff --git a/lib/kadm5/get_s.c b/lib/kadm5/get_s.c
index d8e8ecc9e..d119b0f2a 100644
--- a/lib/kadm5/get_s.c
+++ b/lib/kadm5/get_s.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997, 1998, 1999 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -56,10 +56,9 @@ kadm5_s_get_principal(void *server_handle,
 	return ret;
     ret = context->db->fetch(context->context, context->db, &ent);
     context->db->close(context->context, context->db);
-    if(ret == HDB_ERR_NOENTRY)
+    if(ret)
 	return _kadm5_error_code(ret);
 
-
     memset(out, 0, sizeof(*out));
     if(mask & KADM5_PRINCIPAL)
 	ret  = krb5_copy_principal(context->context, ent.principal,