diff --git a/src/server.jl b/src/server.jl
index 5ecf58c..36e12f3 100644
--- a/src/server.jl
+++ b/src/server.jl
@@ -82,6 +82,9 @@ function handle_connection(f, server, init_context, io, verbose)
                 f(GeminiRequest(Connection(server, client),
                                 Request(String(client.context.data)),
                                 Dict()))
+                @info "Inside close"
+                close(client)
+                @info "Inside close done"
                 break
             end
         end
diff --git a/src/types.jl b/src/types.jl
index 709db12..1c54241 100644
--- a/src/types.jl
+++ b/src/types.jl
@@ -84,6 +84,8 @@ function Request(protocol, host, port, path, query)
         path, query, true, "")
 end
 
+unescape(::Nothing) = ""
+
 "unescape(percent_encoded_uri)::String
 
 Replace %xx escaped chars with their single-character equivalent.