am 04884d34: Merge "ImageLoader: setError after null check"

* commit '04884d344043063aaff1bef567912e1be0f254ff':
  ImageLoader: setError after null check