Add some checks