Improve Error Handling to Prevent Exit, Crashes and Memory Leaks

Improve Error Handling to Prevent Exit, Crashes and Memory Leaks #35