Added names, fixed crash on bad connection.