KH-213: minor tweak and more logging