Fixed error message
Removed deprecated instances of find_or_create_by_...