Replacing a #warning with a TODO and throwing an exception

Follow-up Issue #645