Merge pull request #2351 from yashdv:BOW_assert_error