More comprehensive reporting for error in #18