Fixed 500 error for items with no-content