gustafn
committed
on 28 Mar 08
make component handling more robust