Return nil for current-org if there is nothing in the org box (was returning empty string)
Fix arity error