Remove explicit exception handling
Add (ugly) spec of master forking