Fix the previous crash condition

Remove the crash