Added a server config option + extra error logging