Adding tests for no assets and no thumbnails, as well as code to resolve crashing issue