Restored some checks that did not work properly locally.