Substituted exit with retun in main functions. 

This prevents clever people, like myself, from complaining about memory-leak after
perfectly OK changes by fellow developers. ;)

[[Imported from SVN: r5735]]