Fix picture null case