User != null check
Fix merge