5328: current implementation throws notices. Added variable name to string (cherry picked from commit 91d06ce)