Added catch-all for exceptions