Added check on image uris