Improved emergency exit

Change-Id: Ia639495661523867498a5abb5be908a0883f5b65