Prevent NPE for async updates