Making this a little error resilient