* Fix warnings

Control reaches end of non-void function

* Format

* Revert changes + add throw at EOF

* Alternative fix
Co-authored-by: Scott Cyphers <diyessi@users.noreply.github.com>
Co-authored-by: Sang Ik Lee <sang.ik.lee@intel.com>
Co-authored-by: Robert Kimball <robert.kimball@intel.com>