Made metrics Option instead of Some, fixed NullPointerException