Fix 249

Frank Duncanrequested to merge
ardc-249-500-errors into ardc-production-issues

Two issues that got resolved.

This will auto merge on November 8th

Merge request reports