Fixexception

Correct exceptions/values returned from finder methods.