Insert check in a couple more places.