Rewrote Command error handling, still needs some work