Fix nil

as this is the very last moment fix for RC1 I prefer to do minimal changes