Eliminated unneccesary empty check