Add some more checks