Improve error handling

[bz888]

Often we developing, nil issues appear due to the lack of error handling.
More error handling could improve the development process.