Changed Code to drop fallback if extension not found

+ Throw more exceptions on error