More checks to identify issue #43