excpetion handling diff from Alexander Rieger; THX