Fix import location and tidy up error message