Added NULL-check.
Merge branch 'master' of github.com:rawstudio/rawstudio