[z2176] Avoid crash and .pool command

(based on commit [12258] - cf0c023)

(based on commit [s1809] - 69dc8d8)