am ab087b9f: Fix NPE we\'re seeing in feedback (issue 11626428)

* commit 'ab087b9fbc56c78bf25a06068ff929f8a7ac7ae8':
  Fix NPE we're seeing in feedback (issue 11626428)