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

* commit 'd0c1157c5f931cb70f7eb3148db1ad5e21597365':
  ImageLoader: setError after null check