Added sanity checked to rider commands