Improved errors and specs