Added checks for initial state variables.