Refactor error methods to require no guards and hence no NoMethodErrors