Fixing default, adding error message if not found