andrew.j.c.parker added a subscriber: andrew.j.c.parker. andrew.j.c.parker added a comment. You will also need to change the test: test/depr/exception.unexpected/set.unexpected/set_unexpected.pass.cpp as it makes similar assumptions about an initial non-null handler. http://reviews.llvm.org/D5131