diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
index 607fbdf..8877614 100644
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
@@ -278,10 +278,14 @@ void kvm_arch_flush_shadow(struct kvm *kvm)
 struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id)
 {
 	struct kvm_vcpu *vcpu;
+
 	vcpu = kvmppc_core_vcpu_create(kvm, id);
+	if (IS_ERR(vcpu))
+		return vcpu;
+
 	vcpu->arch.wqp = &vcpu->wq;
-	if (!IS_ERR(vcpu))
-		kvmppc_create_vcpu_debugfs(vcpu, id);
+	kvmppc_create_vcpu_debugfs(vcpu, id);
+
 	return vcpu;
 }