added warning icon and some error dialogue