FS-5399 --resolve
move log message to avoid logging null