Improve error handling and remove panic-prone code

Improve error handling and remove panic-prone code #224