Add better error handling in status, add finer granularity for stats counters