Update for safe/nothrow