Added a check for an empty expression