Fix empty address error (closes #2)