Move field check out for potential performance gains

[tom2strobl]

we could move out the field checks into the outermost function for performance improvements, not sure if it really makes that much of a difference in practice though