Made DataSource catch all exceptions