A few missing error adds in Encapsulation