Sync changes from "stoney" to "master"

Simply removed the error handling?