Add more information to errors #1