Added some configuration checking