Fixed issue #93 by checking if email address is empty