Separate header and author specs, add null checks