Fix null constraint violation
Fix empty name