Add null check
Merge branch 'features/handle-toast-by-id'