Fixed Several NullPointerException

The application has all functionality
After test in lab only some changes are required to
stage