Add some more error analysis