NullPointerException fixed - Proper package Handling. TODO: Generate proper fqn for implicit packages