Fix missing poperror() calls