Bug Fixes

Better error handling, broken image identification