refactored: Exception and Error-Handling - changed the whole behavior.