Bugfix: Adding error trapping for missing or invalid branch code