Resolve #4408 - bad uncaught nil get_once
Land #4412, get_once NilClass fixes