Improved Error handling (less exceptions popping up to the IntelliJ host)