Don't go further and pop the stack if it's empty.

Change-Id: I27bd30ca65cf0066cd022b4b060757913ea01fed