VID-1376 tighten up some assertions and log output