- Retry when reconnection fails (bug #541741). - Prevent traceback with bad marker-levels attribute (bug #541882).