Keep a timeout while connecting and set non-blocking afterwards

Also fix an await to None value