Merge "bugfix: Exception when the results is empty"