improved error msges and location handling