Updated commands to return better errors.