Only run whenever when present, take 2!

Change-Id: Ifa93a596eef9a5159bb9af67a25af2e13c99c8b9