diff --git a/src/core/inf.c b/src/core/inf.c
index 044bac2..ee11ef2 100644
--- a/src/core/inf.c
+++ b/src/core/inf.c
@@ -658,7 +658,6 @@ int hub_perform_login_checks(struct hub_info* hub, struct hub_user* user, struct
 	INF_CHECK(check_user_agent,           hub, user, cmd);
 	INF_CHECK(check_acl,                  hub, user, cmd);
 	INF_CHECK(check_logged_in,            hub, user, cmd);
-	
 	return 0;
 }
 
diff --git a/src/network/connection.c b/src/network/connection.c
index 31e24de..08adc0f 100644
--- a/src/network/connection.c
+++ b/src/network/connection.c
@@ -101,6 +101,9 @@ static void net_con_event(int fd, short ev, void *arg)
 	struct net_connection* con = (struct net_connection*) arg;
 	int events = net_con_convert_from_libevent_mask(ev);
 
+	if (!con->flags)
+		return;
+
 	if (net_con_flag_get(con, NET_CLEANUP))
 	{
 		hub_free(con);