Adding some checks to the config calls.