Fixing NRE in error handling
Fixing SL issue