Fix #391 - Added empty check.