Make android driver a bit more rebust