diff --git a/fmt_ldapsearchfilter.c b/fmt_ldapsearchfilter.c
index e74f5a2..d76f3e0 100644
--- a/fmt_ldapsearchfilter.c
+++ b/fmt_ldapsearchfilter.c
@@ -20,7 +20,7 @@
 int fmt_ldapsubstring(char* dest,struct Substring* s) {
   long sum=0,tmp=0;
   while (s) {
-    tmp=fmt_asn1string(dest,PRIVATE,CONSTRUCTED,s->substrtype,s->s.s,s->s.l);
+    tmp=fmt_asn1string(dest,PRIVATE,PRIMITIVE,s->substrtype,s->s.s,s->s.l);
     if (dest) dest+=tmp; sum+=tmp;
     s=s->next;
   }
diff --git a/tinyldap.c b/tinyldap.c
index f45f8b4..84859ad 100644
--- a/tinyldap.c
+++ b/tinyldap.c
@@ -491,7 +491,13 @@ int handle(int in,int out) {
 	  }
 	}
 	break;
+      case UnbindRequest:
+	close(out); if (in!=out) close(in);
+	return 0;
       default:
+	buffer_puts(buffer_2,"unknown request type ");
+	buffer_putulong(buffer_2,op);
+	buffer_putsflush(buffer_2,"\n");
 	exit(1);
       }
       Len+=res;