Add better error handling
Add os version