Added a couple of empty checks for records and extras