Concerning #733: introduce assertion higher in the call stack