Improve error handling
Fix Crash