Add additional status check.