Fix issue #3 caused by checking an expression for empty()