Removed redundant catches and fixed sigleton implementation in context