Derp. Forgot to replace some hasattr checks with is not None checks that led to attempting to add None to things.