Revert "removed checks"

This reverts commit fde0b8b4fc0d23a5e1eaafce68f59f9e08ff7617.
fixed heroku problems