Handle unannounced returns

Last updated