Fix null pointer (from support info)