Extra intent checking to prevent metadata blanking unexpectedly