- Added extra parameter logging
- More error messages