Error text and formatting per #41 and #43