Removed dictionary check, which was causing 500 errors