adapt to renamed function names
enhance stack trace error output