Add more information to errors