Fix for null output issue.