Added another exception and added failsafe trace walking.