updated legacy system to fail more gracefully