Losen up last introduced checks

Thanks to rsa and dbauz for pointing to exceptions that should not be prevented

(based on commit 33b16ba)

Signed-off-by: Xfurry <xfurry@scriptdev2.com>

(based on commit 34a56ad)

Signed-off-by: Xfurry <xfurry@scriptdev2.com>