Accept files if they are included on upload
Slightly better error handling, still needs work