CLC-3072 Improving CFV 404 handling

https://jira.media.berkeley.edu/jira/browse/CLC-3072