Bugfix: double-check for nil