Only run whenever when present, take 3!

Blargh!

Change-Id: Iba6017c0e0101f0cba1f8e702d696ef1dfa20fba