added missing return statement
dont catch exceptions here
more signup cleanup