More angular stuff and broken rejection handler