Better Exception handling

Adding some Exceptions + removing dead code