add some checks to commands