Fixed NullRefException error
Fixed merge issue