am 2bed570b: Fix bug 3367627 - spontaneous crash

* commit '2bed570bba183249c6ca9ca1151d1d23808de8c1':
  Fix bug 3367627 - spontaneous crash