Raise error instead of returning empty.

Raise error instead of returning empty. #484