Don't check stuff unnecessarily

Change-Id: Ibaff9ffd2848e3e8130dff003095d262d2f14dac