[#1188] Tweak checks to support empty strings