Bugfix - additional nil check