Improve configuration handling to not spew errors