Minor tweaks to try to improve error handling in the face of corrupt AMPs / JARs