Partial removal of try:except, bond refactoring
Merge of local commit with upstream, removal of excess try:excepts in desmond_parser