Made more robust error showing on errors