Improved safety in cases of misuse