null exception issues

committing this just for the record & rolling back to previous