3.11/616 geography crashes

Fix 2 crash instances found by analyzing core dumps coming from sirielle-int after synchronizing the geography package.