Another fix for nil-check runtime issue.