added null/type checks on specific fields of exit