The latter are more explicit and easier to understand at the call site. Also removed the redundant crash checks via the log files.
Added test case that reproduces the problem and verified that it is fixed.