Modified error handling procedure
Only one instance on config