Improve error handling
Implement circle command