1003961 - better error detection

Update the errors detection to new puppet errors format. Also make
sure the services are running at the end.