Fixed nil so it does not break the shell