The social discount rate crucially determines optimal mitigation policies. This paper examines two shortcomings of the recent debate and the models on climate change assessment. First, removing an implicit assumption of (intertemporal) risk neutrality reduces the growth effect in social discounting and significantly amplifies the importance of risk and correlation. Second, debate and models largely overlook the difference in attitude with respect to risk and with respect to non-risk uncertainty. The paper derives the resulting changes of the risk-free and the stochastic social discount rate and points out the importance of even thin tailed uncertainty for climate change evaluation.