Merge "replaced stacktrace with error log"