Remove die!, raplace invocations with fail! Issue #4524 pt 3