Add exception handling, remove error dialog