Trying to fix 500 exceptions.