Improved error handling

Please read prev commit for more info. Added error handling for
consolidated sheet.