Fix crash from Dev Console