[#29] added checking kind against nil