Clean up latency and add error checking

Clean up latency and add error checking #170