Added Error Handling for a few Commands