(360) Add some more checks