Snapshot Jar Crashfix

Temporary, just to mark the offending lines.