Add helpful warning, as well as intercept for fennec