Fix OF 1.0 per Marco's design
Just a couple of changes to maintain the original logical flow, reenable error handling and simplify the code.
Merge pull request #34 from frenetic-lang/handshake-fix

Fix OF 1.0 per Marco's design