Move malloc fail checks closer to malloc