Slight null-value check update, otherwise still remains done.