* Fixed Bug 24320 with patch as suggested by submitter

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@24322 3ad0048d-3df7-0310-abae-a5850022a9f2
* Better patch from Laco for bug 24274, without relying on try/except

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@24323 3ad0048d-3df7-0310-abae-a5850022a9f2