Update to ensure expando isn't null...