Patch of the solution for #34 to account for error behavior