update with sandbox feature
improve error message output logic