Add exception handling back to python datasource