[IMPROVEMENT] Better management of missing connection situation