Added a few extra checks when and configuration variables.