[447868] add some null checks to make it work under Linux
2 files changed