error handling, TODO added. icon changed