Crash avoid (8/48)

Crash avoid