Error handling: Use ValueError exceptions instead of assert

Error handling: Use ValueError exceptions instead of assert #2034