1.4: Fixed null reference in gallery