Added Command Error Handling