Fix error handling for create

/to @ritch 
/cc @chandadharap