Removed empty check