Fixed instability issues due to referenced unavailable view