diff --git a/clients/tools/common.c b/clients/tools/common.c
index 2ca3d2ed8d..c301ee618d 100644
--- a/clients/tools/common.c
+++ b/clients/tools/common.c
@@ -520,7 +520,12 @@ tool_args( int argc, char **argv )
 #endif
 	}
 
-	if( ldapuri != NULL ) {
+	if( ldapuri == NULL ) {
+		if( ldapport && ( ldaphost == NULL )) {
+			fprintf( stderr, "%s: -p without -h is invalid.\n", prog );
+			exit( EXIT_FAILURE );
+		}
+	} else {
 		if( ldaphost != NULL ) {
 			fprintf( stderr, "%s: -H incompatible with -h\n", prog );
 			exit( EXIT_FAILURE );
diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index 093cedf32f..1a09236687 100644
--- a/libraries/libldap/init.c
+++ b/libraries/libldap/init.c
@@ -81,7 +81,6 @@ static const struct ol_attribute {
 #endif
 
 #ifdef HAVE_TLS
-  	{0, ATTR_TLS,		"TLS",			NULL,	LDAP_OPT_X_TLS},
 	{1, ATTR_TLS,		"TLS_CERT",		NULL,	LDAP_OPT_X_TLS_CERTFILE},
 	{1, ATTR_TLS,		"TLS_KEY",		NULL,	LDAP_OPT_X_TLS_KEYFILE},
   	{0, ATTR_TLS,		"TLS_CACERT",	NULL,	LDAP_OPT_X_TLS_CACERTFILE},