maltes
committed
on 29 Jun 06
Added catches for proper processing