More attribute error fixes (cause by null dates)