Corrected callback handling in case clients still at home