Adding a trim to this to be a little more defensive against bad deploys.

While it may be useful to have an early warning that a bad deploy has gone out, I think theres more value in being defensive here