Add more informative errors