PLA-833 handling null in thumbnail field