Deadlock Guard for invalid config files
Merge pull request #52 from EliasOenal/master

Allow recovery from invalid settings.