Added empty-check in picture view