Added error handling, second tab.