Merged revisions 1261 via svnmerge from
http://[email protected]/svn/fpc/trunk

r1261 (hajny)
* check added to avoid potential SIGSEGV

git-svn-id: branches/fixes_2_0@1289 -