OSNG-63 OSNG-64 - removed classCastException and Nullpointer