Improved error messages + GUI
Relocated class