Fixing #27 - Making error message less specific.