* Fix null error when no feature map is provided