Add some message box and error handling