Remove FIXME and add console.error if that happen again