BugFix: check fields on null.