Fixes 500 error for some users

#399
Ready to merge
This branch is ready to get merged automatically.

Sign up or log in to comment