Revert "Revert "Just a check before starting to work""

This reverts commit ad53416b70d9d02247cbe941f69743720768aaf6.