Merging with assert_exists
Fix assert/assert_exists flow