adding check error code
finalizing fix on image retrieval
Merge remote-tracking branch 'origin/paruvendu' into paruvendu