Fixes: runtime error: null pointer passed as argument 2, which is declared to never be null (cherry picked from commit 6f152bef)
