Avoid double check on the configuration.
Merge pull request #457 from remyLemeunier/fix-status-code

Avoid double check on the configuration.