diff --git a/lib/alterl/src/thrift_binary_protocol.erl b/lib/alterl/src/thrift_binary_protocol.erl
index c1f9d4e..c84701e 100644
--- a/lib/alterl/src/thrift_binary_protocol.erl
+++ b/lib/alterl/src/thrift_binary_protocol.erl
@@ -269,5 +269,6 @@
     {ok, Sz}  = read(This, i32),
     {ok, Bin} = read(This, Sz);
 
+read(This, 0) -> {ok, <<>>};
 read(This, Len) when is_integer(Len), Len >= 0 ->
     thrift_transport:read(This#binary_protocol.transport, Len).
diff --git a/lib/alterl/src/thrift_socket_server.erl b/lib/alterl/src/thrift_socket_server.erl
index 046ffca..2bb9181 100644
--- a/lib/alterl/src/thrift_socket_server.erl
+++ b/lib/alterl/src/thrift_socket_server.erl
@@ -103,7 +103,7 @@
     end.
 
 init(State=#thrift_socket_server{ip=Ip, port=Port}) ->
-    process_flag(trap_exit, true), %% only temporary
+    process_flag(trap_exit, true),
     BaseOpts = [binary,
 		{reuseaddr, true},
 		{packet, 0},
@@ -165,7 +165,7 @@
 
 acceptor_loop({Server, Listen, Service, Handler, SocketOpts})
   when is_pid(Server), is_list(SocketOpts) ->
-    case catch gen_tcp:accept(Listen) of % infiinite timeout
+    case catch gen_tcp:accept(Listen) of % infinite timeout
 	{ok, Socket} ->
 	    gen_server:cast(Server, {accepted, self()}),
             ProtoGen = fun() ->