Changed exception to avoid unpredictable results
more readable order