Change from catching un-namespaced ParseException to Exception
Supress a nasty exception backtrace when images aren't present
Fix exception by splitting a method that should've been split to begin with