Attempt to avoid exception seen on jenkins