Added null support for view model