Merge: from culling_falsepos_improv - Bugfix for NRE blocking connection to the server Tests: none, trivial change