Replaced return of empty list with exception