Still getting state null in some cases so add check back in to populate