Some basic improvements to ensure that consecutive calls for the same lifecycle do not cause unnecessary exceptions. Basically an interface quality improvement.