diff --git a/src/close_reason.cpp b/src/close_reason.cpp
index c86bb1b24..b5a0b26ef 100644
--- a/src/close_reason.cpp
+++ b/src/close_reason.cpp
@@ -129,10 +129,6 @@ namespace libtorrent
 #endif
 
 				default:
-					// we should include this error code in the map
-					fprintf(stderr, "(%s : %d) %s\n", ec.category().name(), ec.value()
-						, ec.message().c_str());
-					TORRENT_ASSERT(false);
 					return close_no_reason;
 			}
 		}
@@ -168,14 +164,6 @@ namespace libtorrent
 			return close_no_memory;
 		}
 
-		fprintf(stderr, "(%s : %d) %s\n", ec.category().name(), ec.value()
-			, ec.message().c_str());
-
-		// we should proboably include this in the map
-		TORRENT_ASSERT(false);
-
-		// TODO: map some system errors too?
-
 		return close_no_reason;
 	}
 }
diff --git a/src/socket_type.cpp b/src/socket_type.cpp
index 2f2cd04c4..a399007ce 100644
--- a/src/socket_type.cpp
+++ b/src/socket_type.cpp
@@ -310,7 +310,7 @@ namespace libtorrent
 				break;
 #ifdef TORRENT_USE_OPENSSL
 			case socket_type_int_impl<ssl_stream<utp_stream> >::value:
-				get<ssl_stream<utp_stream> >()->set_close_reason(boost::uint16_t code);
+				get<ssl_stream<utp_stream> >()->lowest_layer().set_close_reason(code);
 				break;
 #endif
 			default: break;
@@ -325,7 +325,7 @@ namespace libtorrent
 				return get<utp_stream>()->get_close_reason();
 #ifdef TORRENT_USE_OPENSSL
 			case socket_type_int_impl<ssl_stream<utp_stream> >::value:
-				return get<ssl_stream<utp_stream> >()->get_close_reason();
+				return get<ssl_stream<utp_stream> >()->lowest_layer().get_close_reason();
 #endif
 			default: return 0;
 		}