Better (?) line retry handling