BUGFIX: When handlers aren't found, they're now set to None to avoid bug