Fix client crash from 072d413