[BUGFIX] Convert eID null return values to a NullResponse