Commit a35205d3f29ba5688d85420c2fa5d14dae4b0fd8

nelisky 2012-03-14T21:31:13

Some tweasks towards clean exit on error