fixed errors in case of content missing