Improved safety features for greater reliability