CS-5089: Fixes crash on lots of empty data