Replaced check for false/null with !empty()