Merge "Try to handle end-of-application better."