Minor changes and extra error message added to export picker.