Diesel Horror

We went to fill up our Mahindra Thar today from Gariep Dam, was that a ******! We almost were out of Diesel, then we saw this place on the right hand side, went off and filled up. Not even 5km the Jeep didn't had any power, smoking black smoke. So.....that means water in the Diesel isn't it? Struggling all the way to Pretoria at this point, because we just want to get home. Please don't make the same mistake we did.