Forget the null case
Fix bundle dependency version