Resolve #3512519 "Pushqueue causes fatal"

Scott Euserrequested to merge
issue/salesforce-3512519:3512519-pushqueue-causes-fatal into 5.1.x

Closes #3512519

Merge request reports