diff --git a/doc/source/boost-exception.reno b/doc/source/boost-exception.reno
index 856d118..36205e6 100644
--- a/doc/source/boost-exception.reno
+++ b/doc/source/boost-exception.reno
@@ -173,7 +173,7 @@
 																		<strong>8A5444CF9C854740F83F17EA2075478A983F7C0243DCE4E42551ECBF908C1392</strong>
 																		<weak>4193409281</weak>
 																		<size>322</size>
-																		<position>766</position>
+																		<position>976</position>
 																	</stream_hook_path>
 																</hook>
 																<file>
@@ -211,14 +211,14 @@
 																<hook>
 																	<stream_hook_path>
 																		<size>2</size>
-																		<strong>33ABFEB440AB44356BBD7B5A695E8186AA8952BFA45F44F8C8DF1D49A3DCDEDA</strong>
-																		<weak>3174366877</weak>
-																		<size>14086</size>
+																		<strong>ED1462B1D0E8A8ED573C40D0A7645AC34ED8822A1C0C7911F2D8B3503AE722F2</strong>
+																		<weak>4140763107</weak>
+																		<size>14130</size>
 																		<position>990</position>
-																		<strong>B18DC30A3F0D524B480C222B3DEC12348928A393A0174D21F22351A2EBEF6E2A</strong>
-																		<weak>242230974</weak>
-																		<size>148</size>
-																		<position>13063</position>
+																		<strong>B08FEA1D676AE767B594D41420BD20E95684EA039DC95087651BFD1BDB9A32F0</strong>
+																		<weak>682506257</weak>
+																		<size>222</size>
+																		<position>13033</position>
 																	</stream_hook_path>
 																</hook>
 																<file>
@@ -708,7 +708,7 @@
 																		<strong>AA363B3E599C558409A17235E029C4F635E4FDE629F763F661BDA7FA5B2D99C2</strong>
 																		<weak>1494903480</weak>
 																		<size>325</size>
-																		<position>1090</position>
+																		<position>1300</position>
 																	</stream_hook_path>
 																</hook>
 																<file>
@@ -862,7 +862,7 @@
 																		<strong>FD7792C2929DD7B6BD613636FD0C574D002286E33811BA109B57B9C4D790D340</strong>
 																		<weak>1830643656</weak>
 																		<size>1244</size>
-																		<position>1417</position>
+																		<position>1627</position>
 																		<strong>BAE73EEDFF4059A7561888B4BA054DFA033F0967727630270F2C0D4EB918B88D</strong>
 																		<weak>3168166030</weak>
 																		<size>1222</size>
@@ -1193,9 +1193,9 @@
 																<hook>
 																	<stream_hook_path>
 																		<size>2</size>
-																		<strong>33ABFEB440AB44356BBD7B5A695E8186AA8952BFA45F44F8C8DF1D49A3DCDEDA</strong>
-																		<weak>3174366877</weak>
-																		<size>14086</size>
+																		<strong>ED1462B1D0E8A8ED573C40D0A7645AC34ED8822A1C0C7911F2D8B3503AE722F2</strong>
+																		<weak>4140763107</weak>
+																		<size>14130</size>
 																		<position>990</position>
 																		<strong>0066D4E6E6B189906E6DE04F08509F3737511701A1B1355B37511EC18E8371F4</strong>
 																		<weak>2078296250</weak>
@@ -1502,9 +1502,9 @@
 																<hook>
 																	<stream_hook_path>
 																		<size>2</size>
-																		<strong>33ABFEB440AB44356BBD7B5A695E8186AA8952BFA45F44F8C8DF1D49A3DCDEDA</strong>
-																		<weak>3174366877</weak>
-																		<size>14086</size>
+																		<strong>ED1462B1D0E8A8ED573C40D0A7645AC34ED8822A1C0C7911F2D8B3503AE722F2</strong>
+																		<weak>4140763107</weak>
+																		<size>14130</size>
 																		<position>990</position>
 																		<strong>1D5E771272B020A105B69E186517499873571F62AFF9D48F130C952CFAA12FA3</strong>
 																		<weak>2841506107</weak>
@@ -1680,9 +1680,9 @@
 																<hook>
 																	<stream_hook_path>
 																		<size>1</size>
-																		<strong>20224D8BEA908D6735D8E30354AA084B40FB24FD8B73B8735F9A3FE047455F8C</strong>
-																		<weak>610532800</weak>
-																		<size>14855</size>
+																		<strong>89A0922F9B7B0D61DA85273763840123D768B1FBCE003C2ECA3A1C5ED5243EFE</strong>
+																		<weak>3109160710</weak>
+																		<size>14899</size>
 																		<position>321</position>
 																	</stream_hook_path>
 																</hook>
@@ -1721,9 +1721,9 @@
 																<hook>
 																	<stream_hook_path>
 																		<size>2</size>
-																		<strong>33ABFEB440AB44356BBD7B5A695E8186AA8952BFA45F44F8C8DF1D49A3DCDEDA</strong>
-																		<weak>3174366877</weak>
-																		<size>14086</size>
+																		<strong>ED1462B1D0E8A8ED573C40D0A7645AC34ED8822A1C0C7911F2D8B3503AE722F2</strong>
+																		<weak>4140763107</weak>
+																		<size>14130</size>
 																		<position>990</position>
 																		<strong>1516D0B7E11CBEB60CE4222565ACCAFF2E9857A8A505C1C26E2AE90087250581</strong>
 																		<weak>3624753243</weak>
@@ -1880,9 +1880,9 @@
 																<hook>
 																	<stream_hook_path>
 																		<size>2</size>
-																		<strong>33ABFEB440AB44356BBD7B5A695E8186AA8952BFA45F44F8C8DF1D49A3DCDEDA</strong>
-																		<weak>3174366877</weak>
-																		<size>14086</size>
+																		<strong>ED1462B1D0E8A8ED573C40D0A7645AC34ED8822A1C0C7911F2D8B3503AE722F2</strong>
+																		<weak>4140763107</weak>
+																		<size>14130</size>
 																		<position>990</position>
 																		<strong>1760DA943E0DCAE6DDB000F3C08D6E6F5F8AEDBBEAC7CAA84A2ED60BFA4B0E1A</strong>
 																		<weak>702729709</weak>
@@ -2488,7 +2488,7 @@
 																		<strong>167C4E3E81D972BC6C9BA70FA5B9289A26B0D36A711F3769674381E8D410A7F6</strong>
 																		<weak>3567454851</weak>
 																		<size>2594</size>
-																		<position>89</position>
+																		<position>299</position>
 																	</stream_hook_path>
 																</hook>
 																<file>
@@ -2769,9 +2769,9 @@
 																<hook>
 																	<stream_hook_path>
 																		<size>3</size>
-																		<strong>33ABFEB440AB44356BBD7B5A695E8186AA8952BFA45F44F8C8DF1D49A3DCDEDA</strong>
-																		<weak>3174366877</weak>
-																		<size>14086</size>
+																		<strong>ED1462B1D0E8A8ED573C40D0A7645AC34ED8822A1C0C7911F2D8B3503AE722F2</strong>
+																		<weak>4140763107</weak>
+																		<size>14130</size>
 																		<position>990</position>
 																		<strong>2482DDAF6A7E31CF75E93B993C86D9814A0B8899B68E555B23D411BD195FE270</strong>
 																		<weak>1574307697</weak>
@@ -13795,7 +13795,7 @@
 											<strong>FD7792C2929DD7B6BD613636FD0C574D002286E33811BA109B57B9C4D790D340</strong>
 											<weak>1830643656</weak>
 											<size>1244</size>
-											<position>1417</position>
+											<position>1627</position>
 											<strong>BAE73EEDFF4059A7561888B4BA054DFA033F0967727630270F2C0D4EB918B88D</strong>
 											<weak>3168166030</weak>
 											<size>1222</size>
@@ -14288,28 +14288,6 @@
 										<id>-64</id>
 									</shared_ptr>
 								</pair>
-								<pair>
-									<hook>
-										<stream_hook_path>
-											<size>1</size>
-											<strong>20224D8BEA908D6735D8E30354AA084B40FB24FD8B73B8735F9A3FE047455F8C</strong>
-											<weak>610532800</weak>
-											<size>14855</size>
-											<position>321</position>
-										</stream_hook_path>
-									</hook>
-									<file>
-										<path>
-											<empty>0</empty>
-											<string>../../../../boost/exception/detail/exception_ptr.hpp</string>
-											<type>0</type>
-											<base>0</base>
-										</path>
-									</file>
-									<shared_ptr>
-										<id>-44</id>
-									</shared_ptr>
-								</pair>
 								<pair>
 									<hook>
 										<stream_hook_path>
@@ -14339,7 +14317,7 @@
 											<strong>8A5444CF9C854740F83F17EA2075478A983F7C0243DCE4E42551ECBF908C1392</strong>
 											<weak>4193409281</weak>
 											<size>322</size>
-											<position>766</position>
+											<position>976</position>
 										</stream_hook_path>
 									</hook>
 									<file>
@@ -14583,7 +14561,7 @@
 											<strong>AA363B3E599C558409A17235E029C4F635E4FDE629F763F661BDA7FA5B2D99C2</strong>
 											<weak>1494903480</weak>
 											<size>325</size>
-											<position>1090</position>
+											<position>1300</position>
 										</stream_hook_path>
 									</hook>
 									<file>
@@ -14620,166 +14598,6 @@
 										<id>-65</id>
 									</shared_ptr>
 								</pair>
-								<pair>
-									<hook>
-										<stream_hook_path>
-											<size>2</size>
-											<strong>33ABFEB440AB44356BBD7B5A695E8186AA8952BFA45F44F8C8DF1D49A3DCDEDA</strong>
-											<weak>3174366877</weak>
-											<size>14086</size>
-											<position>990</position>
-											<strong>1760DA943E0DCAE6DDB000F3C08D6E6F5F8AEDBBEAC7CAA84A2ED60BFA4B0E1A</strong>
-											<weak>702729709</weak>
-											<size>815</size>
-											<position>3118</position>
-										</stream_hook_path>
-									</hook>
-									<file>
-										<path>
-											<empty>0</empty>
-											<string>../../../../boost/exception/detail/exception_ptr.hpp</string>
-											<type>0</type>
-											<base>0</base>
-										</path>
-									</file>
-									<shared_ptr>
-										<id>-49</id>
-									</shared_ptr>
-								</pair>
-								<pair>
-									<hook>
-										<stream_hook_path>
-											<size>2</size>
-											<strong>33ABFEB440AB44356BBD7B5A695E8186AA8952BFA45F44F8C8DF1D49A3DCDEDA</strong>
-											<weak>3174366877</weak>
-											<size>14086</size>
-											<position>990</position>
-											<strong>B18DC30A3F0D524B480C222B3DEC12348928A393A0174D21F22351A2EBEF6E2A</strong>
-											<weak>242230974</weak>
-											<size>148</size>
-											<position>13063</position>
-										</stream_hook_path>
-									</hook>
-									<file>
-										<path>
-											<empty>0</empty>
-											<string>../../../../boost/exception/detail/exception_ptr.hpp</string>
-											<type>0</type>
-											<base>0</base>
-										</path>
-									</file>
-									<shared_ptr>
-										<id>-9</id>
-									</shared_ptr>
-								</pair>
-								<pair>
-									<hook>
-										<stream_hook_path>
-											<size>3</size>
-											<strong>33ABFEB440AB44356BBD7B5A695E8186AA8952BFA45F44F8C8DF1D49A3DCDEDA</strong>
-											<weak>3174366877</weak>
-											<size>14086</size>
-											<position>990</position>
-											<strong>2482DDAF6A7E31CF75E93B993C86D9814A0B8899B68E555B23D411BD195FE270</strong>
-											<weak>1574307697</weak>
-											<size>8349</size>
-											<position>4068</position>
-											<strong>7E162EB263369C2C485D5F69CA1A4FADD3EEBC6EB78CE7A767A8615885178079</strong>
-											<weak>1179386730</weak>
-											<size>5404</size>
-											<position>2935</position>
-										</stream_hook_path>
-									</hook>
-									<file>
-										<path>
-											<empty>0</empty>
-											<string>../../../../boost/exception/detail/exception_ptr.hpp</string>
-											<type>0</type>
-											<base>0</base>
-										</path>
-									</file>
-									<shared_ptr>
-										<id>-70</id>
-									</shared_ptr>
-								</pair>
-								<pair>
-									<hook>
-										<stream_hook_path>
-											<size>2</size>
-											<strong>33ABFEB440AB44356BBD7B5A695E8186AA8952BFA45F44F8C8DF1D49A3DCDEDA</strong>
-											<weak>3174366877</weak>
-											<size>14086</size>
-											<position>990</position>
-											<strong>1516D0B7E11CBEB60CE4222565ACCAFF2E9857A8A505C1C26E2AE90087250581</strong>
-											<weak>3624753243</weak>
-											<size>279</size>
-											<position>1373</position>
-										</stream_hook_path>
-									</hook>
-									<file>
-										<path>
-											<empty>0</empty>
-											<string>../../../../boost/exception/detail/exception_ptr.hpp</string>
-											<type>0</type>
-											<base>0</base>
-										</path>
-									</file>
-									<shared_ptr>
-										<id>-45</id>
-									</shared_ptr>
-								</pair>
-								<pair>
-									<hook>
-										<stream_hook_path>
-											<size>2</size>
-											<strong>33ABFEB440AB44356BBD7B5A695E8186AA8952BFA45F44F8C8DF1D49A3DCDEDA</strong>
-											<weak>3174366877</weak>
-											<size>14086</size>
-											<position>990</position>
-											<strong>1D5E771272B020A105B69E186517499873571F62AFF9D48F130C952CFAA12FA3</strong>
-											<weak>2841506107</weak>
-											<size>891</size>
-											<position>173</position>
-										</stream_hook_path>
-									</hook>
-									<file>
-										<path>
-											<empty>0</empty>
-											<string>../../../../boost/exception/detail/exception_ptr.hpp</string>
-											<type>0</type>
-											<base>0</base>
-										</path>
-									</file>
-									<shared_ptr>
-										<id>-40</id>
-									</shared_ptr>
-								</pair>
-								<pair>
-									<hook>
-										<stream_hook_path>
-											<size>2</size>
-											<strong>33ABFEB440AB44356BBD7B5A695E8186AA8952BFA45F44F8C8DF1D49A3DCDEDA</strong>
-											<weak>3174366877</weak>
-											<size>14086</size>
-											<position>990</position>
-											<strong>0066D4E6E6B189906E6DE04F08509F3737511701A1B1355B37511EC18E8371F4</strong>
-											<weak>2078296250</weak>
-											<size>305</size>
-											<position>1066</position>
-										</stream_hook_path>
-									</hook>
-									<file>
-										<path>
-											<empty>0</empty>
-											<string>../../../../boost/exception/detail/exception_ptr.hpp</string>
-											<type>0</type>
-											<base>0</base>
-										</path>
-									</file>
-									<shared_ptr>
-										<id>-33</id>
-									</shared_ptr>
-								</pair>
 								<pair>
 									<hook>
 										<stream_hook_path>
@@ -14902,6 +14720,166 @@
 										<id>-14</id>
 									</shared_ptr>
 								</pair>
+								<pair>
+									<hook>
+										<stream_hook_path>
+											<size>2</size>
+											<strong>ED1462B1D0E8A8ED573C40D0A7645AC34ED8822A1C0C7911F2D8B3503AE722F2</strong>
+											<weak>4140763107</weak>
+											<size>14130</size>
+											<position>990</position>
+											<strong>1760DA943E0DCAE6DDB000F3C08D6E6F5F8AEDBBEAC7CAA84A2ED60BFA4B0E1A</strong>
+											<weak>702729709</weak>
+											<size>815</size>
+											<position>3118</position>
+										</stream_hook_path>
+									</hook>
+									<file>
+										<path>
+											<empty>0</empty>
+											<string>../../../../boost/exception/detail/exception_ptr.hpp</string>
+											<type>0</type>
+											<base>0</base>
+										</path>
+									</file>
+									<shared_ptr>
+										<id>-49</id>
+									</shared_ptr>
+								</pair>
+								<pair>
+									<hook>
+										<stream_hook_path>
+											<size>3</size>
+											<strong>ED1462B1D0E8A8ED573C40D0A7645AC34ED8822A1C0C7911F2D8B3503AE722F2</strong>
+											<weak>4140763107</weak>
+											<size>14130</size>
+											<position>990</position>
+											<strong>2482DDAF6A7E31CF75E93B993C86D9814A0B8899B68E555B23D411BD195FE270</strong>
+											<weak>1574307697</weak>
+											<size>8349</size>
+											<position>4068</position>
+											<strong>7E162EB263369C2C485D5F69CA1A4FADD3EEBC6EB78CE7A767A8615885178079</strong>
+											<weak>1179386730</weak>
+											<size>5404</size>
+											<position>2935</position>
+										</stream_hook_path>
+									</hook>
+									<file>
+										<path>
+											<empty>0</empty>
+											<string>../../../../boost/exception/detail/exception_ptr.hpp</string>
+											<type>0</type>
+											<base>0</base>
+										</path>
+									</file>
+									<shared_ptr>
+										<id>-70</id>
+									</shared_ptr>
+								</pair>
+								<pair>
+									<hook>
+										<stream_hook_path>
+											<size>2</size>
+											<strong>ED1462B1D0E8A8ED573C40D0A7645AC34ED8822A1C0C7911F2D8B3503AE722F2</strong>
+											<weak>4140763107</weak>
+											<size>14130</size>
+											<position>990</position>
+											<strong>1516D0B7E11CBEB60CE4222565ACCAFF2E9857A8A505C1C26E2AE90087250581</strong>
+											<weak>3624753243</weak>
+											<size>279</size>
+											<position>1373</position>
+										</stream_hook_path>
+									</hook>
+									<file>
+										<path>
+											<empty>0</empty>
+											<string>../../../../boost/exception/detail/exception_ptr.hpp</string>
+											<type>0</type>
+											<base>0</base>
+										</path>
+									</file>
+									<shared_ptr>
+										<id>-45</id>
+									</shared_ptr>
+								</pair>
+								<pair>
+									<hook>
+										<stream_hook_path>
+											<size>2</size>
+											<strong>ED1462B1D0E8A8ED573C40D0A7645AC34ED8822A1C0C7911F2D8B3503AE722F2</strong>
+											<weak>4140763107</weak>
+											<size>14130</size>
+											<position>990</position>
+											<strong>1D5E771272B020A105B69E186517499873571F62AFF9D48F130C952CFAA12FA3</strong>
+											<weak>2841506107</weak>
+											<size>891</size>
+											<position>173</position>
+										</stream_hook_path>
+									</hook>
+									<file>
+										<path>
+											<empty>0</empty>
+											<string>../../../../boost/exception/detail/exception_ptr.hpp</string>
+											<type>0</type>
+											<base>0</base>
+										</path>
+									</file>
+									<shared_ptr>
+										<id>-40</id>
+									</shared_ptr>
+								</pair>
+								<pair>
+									<hook>
+										<stream_hook_path>
+											<size>2</size>
+											<strong>ED1462B1D0E8A8ED573C40D0A7645AC34ED8822A1C0C7911F2D8B3503AE722F2</strong>
+											<weak>4140763107</weak>
+											<size>14130</size>
+											<position>990</position>
+											<strong>B08FEA1D676AE767B594D41420BD20E95684EA039DC95087651BFD1BDB9A32F0</strong>
+											<weak>682506257</weak>
+											<size>222</size>
+											<position>13033</position>
+										</stream_hook_path>
+									</hook>
+									<file>
+										<path>
+											<empty>0</empty>
+											<string>../../../../boost/exception/detail/exception_ptr.hpp</string>
+											<type>0</type>
+											<base>0</base>
+										</path>
+									</file>
+									<shared_ptr>
+										<id>-9</id>
+									</shared_ptr>
+								</pair>
+								<pair>
+									<hook>
+										<stream_hook_path>
+											<size>2</size>
+											<strong>ED1462B1D0E8A8ED573C40D0A7645AC34ED8822A1C0C7911F2D8B3503AE722F2</strong>
+											<weak>4140763107</weak>
+											<size>14130</size>
+											<position>990</position>
+											<strong>0066D4E6E6B189906E6DE04F08509F3737511701A1B1355B37511EC18E8371F4</strong>
+											<weak>2078296250</weak>
+											<size>305</size>
+											<position>1066</position>
+										</stream_hook_path>
+									</hook>
+									<file>
+										<path>
+											<empty>0</empty>
+											<string>../../../../boost/exception/detail/exception_ptr.hpp</string>
+											<type>0</type>
+											<base>0</base>
+										</path>
+									</file>
+									<shared_ptr>
+										<id>-33</id>
+									</shared_ptr>
+								</pair>
 								<pair>
 									<hook>
 										<stream_hook_path>
@@ -14935,7 +14913,7 @@
 											<strong>167C4E3E81D972BC6C9BA70FA5B9289A26B0D36A711F3769674381E8D410A7F6</strong>
 											<weak>3567454851</weak>
 											<size>2594</size>
-											<position>89</position>
+											<position>299</position>
 										</stream_hook_path>
 									</hook>
 									<file>
@@ -14950,6 +14928,28 @@
 										<id>-63</id>
 									</shared_ptr>
 								</pair>
+								<pair>
+									<hook>
+										<stream_hook_path>
+											<size>1</size>
+											<strong>89A0922F9B7B0D61DA85273763840123D768B1FBCE003C2ECA3A1C5ED5243EFE</strong>
+											<weak>3109160710</weak>
+											<size>14899</size>
+											<position>321</position>
+										</stream_hook_path>
+									</hook>
+									<file>
+										<path>
+											<empty>0</empty>
+											<string>../../../../boost/exception/detail/exception_ptr.hpp</string>
+											<type>0</type>
+											<base>0</base>
+										</path>
+									</file>
+									<shared_ptr>
+										<id>-44</id>
+									</shared_ptr>
+								</pair>
 							</sorted>
 						</index>
 					</object>
diff --git a/include/boost/exception/detail/exception_ptr.hpp b/include/boost/exception/detail/exception_ptr.hpp
index b1731ee..b4e3a41 100644
--- a/include/boost/exception/detail/exception_ptr.hpp
+++ b/include/boost/exception/detail/exception_ptr.hpp
@@ -455,6 +455,8 @@ boost
         {
         BOOST_ASSERT(p);
         p.ptr_->rethrow();
+        BOOST_ASSERT(0);
+        abort();
         }
 
     inline
diff --git a/include/boost/throw_exception.hpp b/include/boost/throw_exception.hpp
index a384054..c1bff43 100644
--- a/include/boost/throw_exception.hpp
+++ b/include/boost/throw_exception.hpp
@@ -1,5 +1,11 @@
-#ifndef BOOST_THROW_EXCEPTION_HPP_INCLUDED
-#define BOOST_THROW_EXCEPTION_HPP_INCLUDED
+#ifndef UUID_AA15E74A856F11E08B8D93F24824019B
+#define UUID_AA15E74A856F11E08B8D93F24824019B
+#if defined(__GNUC__) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
+#pragma GCC system_header
+#endif
+#if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
+#pragma warning(push,1)
+#endif
 
 // MS compatible compilers support #pragma once
 
@@ -88,4 +94,7 @@ template<class E> BOOST_ATTRIBUTE_NORETURN inline void throw_exception( E const
 #endif
 } // namespace boost
 
-#endif // #ifndef BOOST_THROW_EXCEPTION_HPP_INCLUDED
+#if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
+#pragma warning(pop)
+#endif
+#endif