Improved error handling
Refactoring
Fixed an error that debugged wrong test in TarGUI