Make sure we don't access fields without dereference. Closes #621