[master] Two minor fixes for two tracebacks