Add more context information to the log message at line 424