Improved error handling / isolation