Fixes Necrodoom's code

Needs more exception