Fix new ValueError thrown from Django 1.5 - not sure if it is the right strategy