Merge "Include URI in traceback if filename is unknown"