Don't trust the user coming in
Merge pull request #734 from wasade/issue_733

Don't trust the user coming in