Changed nil to null