Fixed bug in exception handling
GUI improvements