added catch of different commands