fixed issues with logging in Bapi's commit
WF-1653 - Fixed Bugs.