- Better error handling (test it)