Catch error when parsing binding/address file
Merge branch 'master' into debian