Improved error handling by (via alerts everywhere)