Inital error handling, more commands added