Added few more defensive layers to calls that *may* be part of the crash-on-startup-at-weird-random-times bug