Bugfix to last commit: Handling special case nil.