Merging ae1f5c9 to fix throws on rejection