error handling
Better errorhandling and visual feedback for the user