Fix bug not allowing missing metric type

Summary: Was assigning optional that was null

Test Plan: extended unit tests

Reviewed By: max