Fixing Bugs. Need Better Errors Handling