PLA-897 additional empty check added