Revert "Removed unused checks"

This reverts commit 12c1ff17f77c0db6acaf5cd37b27a15f6c08fac5.
111