Added empty check