Fixed Custom command failure issue, attached interdiff for same.