Better error handling and info on screen