Add src parameter to log calls
Do not return inside try...catch