Fixed throwing Exception with proper params