improved the error handling during cluster forking to gracefully exit when appropriate
improved the error handling during cluster forking to gracefully exit when appropriate
fixing up some tests