Improve parameter management to avoid displaying stack trace