Removed reliance on always having an available thumbnail. Closes #58