Reworked error case due to missing TODO.
Now will properly ERROR out, previously was hacky for debugging.