fix for webapp null issue