DEV-56678 - TypeError: 'null' is not an object from