Fix flow exception wording
Fix state check