Fixup server communication error check and integration config