Added more state information checks.