[minor] Added state check