Improved the error handling and added tooltips.