Fix #12 while adding an error code for #35