Better TODO exception and messages
refactor error messages