Fixes to error handling on collection.create