Fix error handling
fix naming
Input validation exception
Fix coding standards