slight improvement in edge case logging