Made sure that we accept nil on lower versions of rails