Added workaround to avoid propagation of server errors