Adding more diagnostics
TODO: Potentially need new exception type (see TODO in EC2Computer.java)