Add some better error facilities