Small fixes on the exceptions