Some error handling until #1 is fixed