Fixed recursive field population issue

Signed-off-by: Tom Wright <tom@inflatablecookie.com>
Added provider check in EntityLocator factory

Signed-off-by: Tom Wright <tom@inflatablecookie.com>