Add Error condition
Merge branch 'master' of github.com:lairdm/islandviewer-ui