1) correct some cut&paste bug
2) added always notification to user in case of internal problems