Added null checks, modified properties file