More work on properly dealing with renewals.
Was missing some error methods.