Added check for empty address. #1