Small improvements in error handling of reservation termination.