Improve safe mode error detection

[Awuwunya]

There needs to be more thought put into error detection in safe mode. Although many common cases are already detected, more uncommon mistakes may not be covered. To work effectively, all errors should be detected

[Awuwunya]

Latest commits have improved this but its still lacking