Add more explicit check