Error handeling + Testing
Error handeling + Testing