Resolves: fdo#86451 guard all the tops post pop

Change-Id: Ic89edb94c6c12a66fd46e0630115a458857cc6cc