Got basic code working again

Need to work out how to respond to error properly.
So, I would I pass back the defaultLocation instead

Signed-off-by: Ippoippo <ippoippo-software@ippoippo-eco.com>
Correct error message

Signed-off-by: Ippoippo <ippoippo-software@ippoippo-eco.com>