Added try/catch to prevent errors until #260 is sorted