Merge pull request #47 from neonbunny/master

Resolve #46 and scripted data source updates
handle an error condition in the front end js
handle an error condition in the front end js
Fix for #49 and removed more exception handling being used for flow control which could have caused exceptions being wrongly swallowed