Removed unreachable error handling, resolves #33